diff --git a/build.gradle b/build.gradle index f60d5703e..eb8d69017 100644 --- a/build.gradle +++ b/build.gradle @@ -76,7 +76,7 @@ writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex) rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm") // Forgix settings (used for merging jars) forgix { - group = "com.seibel.lod" + group = "com.seibel.distanthorizons" mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar" if (findProject(":forge")) @@ -94,7 +94,7 @@ forgix { jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar" } - removeDuplicate "com.seibel.lod" + removeDuplicate "com.seibel.distanthorizons" } subprojects { p -> @@ -162,7 +162,7 @@ subprojects { p -> // (This will point to a non-existent class in all sub-projects except "Core") if (p == project(":core")) { application { - mainClass.set("com.seibel.lod.core.jar.JarMain") + mainClass.set("com.seibel.distanthorizons.core.jar.JarMain") } } @@ -260,11 +260,11 @@ subprojects { p -> configurations = [project.configurations.shadowMe] if (isMinecraftSubProject && p != project(":common")) { configurations.push(project.configurations.shadowCommon) // Shadow the common subproject - relocate "com.seibel.lod.common", "loaderCommon.${p.name}.com.seibel.lod.common" // Move the loader files to a different location + relocate "com.seibel.distanthorizons.common", "loaderCommon.${p.name}.com.seibel.distanthorizons.common" // Move the loader files to a different location if (findProject(":fabricLike") && p != project(":fabricLike")) { configurations.push(project.configurations.shadowFabricLike) // Shadow the fabricLike subproject - relocate "com.seibel.lod.fabriclike", "loaderCommon.${p.name}.com.seibel.lod.fabriclike" // Move the loader files to a different location + relocate "com.seibel.distanthorizons.fabriclike", "loaderCommon.${p.name}.com.seibel.distanthorizons.fabriclike" // Move the loader files to a different location } } def librariesLocation = "distanthorizons.libraries" @@ -368,7 +368,7 @@ subprojects { p -> manifest { attributes 'Implementation-Title': rootProject.mod_name, 'Implementation-Version': rootProject.mod_version, - 'Main-Class': 'com.seibel.lod.core.jar.JarMain' // When changing the main of the jar change this line + 'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line } } @@ -516,9 +516,9 @@ allprojects { p -> task copyCommonLoaderResources(type: Copy) { - from project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener") + from project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener") into(file(p.file("build/resources/main"))) - rename "${accessWidenerVersion}.lod.accesswidener", "lod.accesswidener" + rename "${accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener" // Move the fabricLike mixin to its different places for each subproject if (findProject(":fabricLike")) { @@ -540,7 +540,7 @@ allprojects { p -> // Delete all the duplicated accesswideners delete fileTree(p.file("build/resources/main")) { - include "*.lod.accesswidener" + include "*.distanthorizons.accesswidener" } } diff --git a/common/build.gradle b/common/build.gradle index e25fd0dd0..b61221fda 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,7 +3,7 @@ plugins { } minecraft { - accessWideners(project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener")) + accessWideners(project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")) version(rootProject.minecraft_version) } diff --git a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java b/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java similarity index 79% rename from common/src/main/java/com/seibel/lod/common/LodCommonMain.java rename to common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java index 623fd684f..909fcd7ba 100644 --- a/common/src/main/java/com/seibel/lod/common/LodCommonMain.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/LodCommonMain.java @@ -17,14 +17,14 @@ * along with this program. If not, see . */ -package com.seibel.lod.common; +package com.seibel.distanthorizons.common; -import com.seibel.lod.common.forge.LodForgeMethodCaller; -import com.seibel.lod.common.wrappers.DependencySetup; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.api.internal.SharedApi; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.config.ConfigBase; +import com.seibel.distanthorizons.common.forge.LodForgeMethodCaller; +import com.seibel.distanthorizons.common.wrappers.DependencySetup; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.api.internal.SharedApi; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.ConfigBase; /** * This is the common main class diff --git a/common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java b/common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java similarity index 93% rename from common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java rename to common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java index d2cc70be3..e086f6b96 100644 --- a/common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/forge/LodForgeMethodCaller.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.forge; +package com.seibel.distanthorizons.common.forge; -import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.core.Direction; #if POST_MC_1_19 diff --git a/common/src/main/java/com/seibel/lod/common/networking/NetworkHandler.java b/common/src/main/java/com/seibel/distanthorizons/common/networking/NetworkHandler.java similarity index 96% rename from common/src/main/java/com/seibel/lod/common/networking/NetworkHandler.java rename to common/src/main/java/com/seibel/distanthorizons/common/networking/NetworkHandler.java index 216dada4b..ecef2606c 100644 --- a/common/src/main/java/com/seibel/lod/common/networking/NetworkHandler.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/networking/NetworkHandler.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.networking; +package com.seibel.distanthorizons.common.networking; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; diff --git a/common/src/main/java/com/seibel/lod/common/networking/NetworkReceiver.java b/common/src/main/java/com/seibel/distanthorizons/common/networking/NetworkReceiver.java similarity index 86% rename from common/src/main/java/com/seibel/lod/common/networking/NetworkReceiver.java rename to common/src/main/java/com/seibel/distanthorizons/common/networking/NetworkReceiver.java index ca8692686..218e70955 100644 --- a/common/src/main/java/com/seibel/lod/common/networking/NetworkReceiver.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/networking/NetworkReceiver.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.networking; +package com.seibel.distanthorizons.common.networking; /* #if MC_1_16_5 @@ -47,14 +47,14 @@ public class NetworkReceiver { static class ServerReceiver implements NetworkManager.NetworkReceiver { @Override public void receive(FriendlyByteBuf buf, NetworkManager.PacketContext context) { - com.seibel.lod.common.networking.NetworkHandler.receivePacketServer(buf, context.getPlayer()); + com.seibel.distanthorizons.common.networking.NetworkHandler.receivePacketServer(buf, context.getPlayer()); } } static class ClientReceiver implements NetworkManager.NetworkReceiver { @Override public void receive(FriendlyByteBuf buf, NetworkManager.PacketContext context) { - com.seibel.lod.common.networking.NetworkHandler.receivePacketClient(Minecraft.getInstance(), buf, context.getPlayer()); + com.seibel.distanthorizons.common.networking.NetworkHandler.receivePacketClient(Minecraft.getInstance(), buf, context.getPlayer()); } } */ diff --git a/common/src/main/java/com/seibel/lod/common/networking/Networking.java b/common/src/main/java/com/seibel/distanthorizons/common/networking/Networking.java similarity index 95% rename from common/src/main/java/com/seibel/lod/common/networking/Networking.java rename to common/src/main/java/com/seibel/distanthorizons/common/networking/Networking.java index f1a564c66..a2d52071f 100644 --- a/common/src/main/java/com/seibel/lod/common/networking/Networking.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/networking/Networking.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.networking; +package com.seibel.distanthorizons.common.networking; -import com.seibel.lod.coreapi.ModInfo; +import com.seibel.distanthorizons.coreapi.ModInfo; //#if MC_1_16_5 //import me.shedaniel.architectury.networking.NetworkManager; //#else diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java similarity index 66% rename from common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java index 61440e522..ec01f988b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetup.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java @@ -17,21 +17,21 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers; +package com.seibel.distanthorizons.common.wrappers; -import com.seibel.lod.common.wrappers.gui.LangWrapper; -import com.seibel.lod.common.wrappers.minecraft.MinecraftDedicatedServerWrapper; -import com.seibel.lod.core.wrapperInterfaces.config.ILangWrapper; -import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; -import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper; -import com.seibel.lod.core.IReflectionHandler; -import com.seibel.lod.core.ReflectionHandler; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; +import com.seibel.distanthorizons.common.wrappers.gui.LangWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftDedicatedServerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; +import com.seibel.distanthorizons.core.IReflectionHandler; +import com.seibel.distanthorizons.core.ReflectionHandler; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; /** * Binds all necessary dependencies, so we diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetupDoneCheck.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetupDoneCheck.java similarity index 95% rename from common/src/main/java/com/seibel/lod/common/wrappers/DependencySetupDoneCheck.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetupDoneCheck.java index 00fa8ade1..33d2356e0 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/DependencySetupDoneCheck.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetupDoneCheck.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers; +package com.seibel.distanthorizons.common.wrappers; import java.util.function.Supplier; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java similarity index 93% rename from common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java index b27f9c283..b35cf9255 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/McObjectConverter.java @@ -17,17 +17,17 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers; +package com.seibel.distanthorizons.common.wrappers; import java.nio.FloatBuffer; import java.util.function.BiConsumer; import java.util.function.Consumer; import com.mojang.math.Matrix4f; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java similarity index 91% rename from common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java index 400dfef24..782e9ab92 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers; +package com.seibel.distanthorizons.common.wrappers; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; /** diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java similarity index 81% rename from common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java index cfa12fa68..11e8fe2eb 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/WrapperFactory.java @@ -17,20 +17,20 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers; +package com.seibel.distanthorizons.common.wrappers; -import com.seibel.lod.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; -import com.seibel.lod.common.wrappers.block.BlockStateWrapper; -import com.seibel.lod.common.wrappers.block.BiomeWrapper; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.core.level.IDhLevel; -import com.seibel.lod.core.level.IDhServerLevel; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator; +import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; +import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.core.level.IDhLevel; +import com.seibel.distanthorizons.core.level.IDhServerLevel; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.chunk.ChunkAccess; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java similarity index 92% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/BiomeWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java index 6ed895570..b9004fe55 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java @@ -17,19 +17,16 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.block; +package com.seibel.distanthorizons.common.wrappers.block; import java.io.IOException; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.function.Function; -import com.google.common.collect.ImmutableBiMap; import com.google.gson.JsonParser; import com.mojang.serialization.JsonOps; -import com.mojang.serialization.Lifecycle; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.core.Holder; @@ -37,7 +34,6 @@ import net.minecraft.core.Holder; import net.minecraft.data.worldgen.biome.EndBiomes; import net.minecraft.data.worldgen.biome.NetherBiomes; #endif -import net.minecraft.resources.RegistryFixedCodec; import net.minecraft.resources.RegistryOps; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biomes; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java similarity index 92% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/BlockStateWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index 927b99edd..ca63130ff 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -1,14 +1,13 @@ -package com.seibel.lod.common.wrappers.block; +package com.seibel.distanthorizons.common.wrappers.block; import com.google.gson.JsonParser; import com.mojang.serialization.JsonOps; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; import net.minecraft.world.level.block.state.BlockState; import org.apache.logging.log4j.Logger; import java.io.IOException; -import java.util.HashMap; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/TextureAtlasSpriteWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java similarity index 97% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/TextureAtlasSpriteWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java index bb00f19c0..b5c8aa807 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/TextureAtlasSpriteWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TextureAtlasSpriteWrapper.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.block; +package com.seibel.distanthorizons.common.wrappers.block; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java similarity index 94% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java index 2edd0a3c2..397a698e5 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideFast.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideFast.java @@ -17,15 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.block; +package com.seibel.distanthorizons.common.wrappers.block; -import com.seibel.lod.common.LodCommonMain; -import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; -import net.minecraft.Util; -import net.minecraft.client.color.block.BlockTintCache; -import net.minecraft.client.renderer.BiomeColors; +import com.seibel.distanthorizons.common.LodCommonMain; import net.minecraft.core.BlockPos; -import net.minecraft.core.Cursor3D; import net.minecraft.core.Direction; import net.minecraft.world.level.*; import net.minecraft.world.level.biome.Biome; @@ -41,7 +36,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; import java.util.Optional; -import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; import java.util.stream.Stream; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java similarity index 96% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java index 479c58c5a..db55adb21 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintGetterOverrideSmooth.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java @@ -17,13 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.block; +package com.seibel.distanthorizons.common.wrappers.block; -import com.seibel.lod.common.LodCommonMain; -import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; -import net.minecraft.Util; -import net.minecraft.client.color.block.BlockTintCache; -import net.minecraft.client.renderer.BiomeColors; +import com.seibel.distanthorizons.common.LodCommonMain; import net.minecraft.core.BlockPos; import net.minecraft.core.Cursor3D; import net.minecraft.core.Direction; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintWithoutLevelOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java similarity index 88% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/TintWithoutLevelOverrider.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java index a83e719fb..a43b79b78 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintWithoutLevelOverrider.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java @@ -17,29 +17,19 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.block; +package com.seibel.distanthorizons.common.wrappers.block; -import com.seibel.lod.common.LodCommonMain; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Holder; import net.minecraft.world.level.*; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.lighting.LevelLightEngine; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.phys.AABB; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.Vec3; -import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; -import java.util.Optional; -import java.util.function.Supplier; -import java.util.stream.Stream; - public class TintWithoutLevelOverrider implements BlockAndTintGetter { final BiomeWrapper biome; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintWithoutLevelSmoothOverrider.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java similarity index 97% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/TintWithoutLevelSmoothOverrider.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java index b272e6c88..bc68a4ee1 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/TintWithoutLevelSmoothOverrider.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java @@ -17,11 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.block; +package com.seibel.distanthorizons.common.wrappers.block; -import com.seibel.lod.common.LodCommonMain; import net.minecraft.core.BlockPos; -import net.minecraft.core.Cursor3D; import net.minecraft.core.Direction; import net.minecraft.core.Holder; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockDetailMap.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java similarity index 78% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockDetailMap.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java index d13563282..e8bfdce3f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockDetailMap.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockDetailMap.java @@ -1,8 +1,8 @@ -package com.seibel.lod.common.wrappers.block.cache; +package com.seibel.distanthorizons.common.wrappers.block.cache; -import com.seibel.lod.common.wrappers.block.BiomeWrapper; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.pos.DhBlockPos; import net.minecraft.world.level.block.state.BlockState; import java.util.concurrent.ConcurrentHashMap; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java similarity index 91% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java index c64c60b8f..b6e66a990 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ClientBlockStateCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java @@ -1,11 +1,14 @@ -package com.seibel.lod.common.wrappers.block.cache; +package com.seibel.distanthorizons.common.wrappers.block.cache; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.block.*; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.util.ColorUtil; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; +import com.seibel.distanthorizons.common.wrappers.block.TextureAtlasSpriteWrapper; +import com.seibel.distanthorizons.common.wrappers.block.TintWithoutLevelOverrider; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.block.*; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.util.ColorUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockDetailMap.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java similarity index 89% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockDetailMap.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java index 88193e38b..7eaa8e0e0 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockDetailMap.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockDetailMap.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.block.cache; +package com.seibel.distanthorizons.common.wrappers.block.cache; import java.util.concurrent.ConcurrentHashMap; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; +import com.seibel.distanthorizons.core.pos.DhBlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java similarity index 89% rename from common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java index ee44b6f03..60c2fe44e 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/block/cache/ServerBlockStateCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ServerBlockStateCache.java @@ -1,9 +1,9 @@ -package com.seibel.lod.common.wrappers.block.cache; +package com.seibel.distanthorizons.common.wrappers.block.cache; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.LevelReader; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java similarity index 93% rename from common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java index f349e3595..78c4520b4 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java @@ -17,23 +17,22 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.chunk; +package com.seibel.distanthorizons.common.wrappers.chunk; -import com.seibel.lod.api.enums.config.ELightGenerationMode; -import com.seibel.lod.common.wrappers.block.BlockStateWrapper; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.pos.Pos2D; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.api.enums.config.ELightGenerationMode; +import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; +import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.pos.Pos2D; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.common.wrappers.block.BiomeWrapper; -import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion; - -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import net.minecraft.client.multiplayer.ClientChunkCache; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; @@ -53,7 +52,6 @@ import org.jetbrains.annotations.Nullable; import java.util.HashMap; import java.util.WeakHashMap; -import java.util.concurrent.ConcurrentSkipListMap; import java.util.concurrent.locks.ReentrantReadWriteLock; public class ChunkWrapper implements IChunkWrapper diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java similarity index 97% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/ClassicConfigGUI.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index e6fede427..9d329cce4 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -1,4 +1,4 @@ -package com.seibel.lod.common.wrappers.gui; +package com.seibel.distanthorizons.common.wrappers.gui; import java.util.AbstractMap; import java.util.ArrayList; @@ -15,22 +15,22 @@ import java.util.regex.Pattern; // Logger (for debug stuff) -import com.seibel.lod.api.enums.config.DisallowSelectingViaConfigGui; -import com.seibel.lod.common.wrappers.gui.updater.ChangelogScreen; -import com.seibel.lod.core.config.types.*; +import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.config.ConfigBase; +import com.seibel.distanthorizons.core.config.types.*; +import com.seibel.distanthorizons.common.wrappers.gui.updater.ChangelogScreen; // Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge already includes this) // Gets info from our own mod -import com.seibel.lod.core.config.*; - // Minecraft imports import com.mojang.blaze3d.vertex.PoseStack; -import com.seibel.lod.core.jar.updater.SelfUpdater; -import com.seibel.lod.core.util.AnnotationUtil; -import com.seibel.lod.coreapi.ModInfo; +import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; +import com.seibel.distanthorizons.core.util.AnnotationUtil; +import com.seibel.distanthorizons.coreapi.ModInfo; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java similarity index 70% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java index 246fa161b..b8b69b680 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/GetConfigScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java @@ -1,13 +1,13 @@ -package com.seibel.lod.common.wrappers.gui; +package com.seibel.distanthorizons.common.wrappers.gui; -import com.seibel.lod.core.config.eventHandlers.QuickRenderToggleConfigEventHandler; -import com.seibel.lod.core.config.eventHandlers.presets.RenderQualityPresetConfigEventHandler; -import com.seibel.lod.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.config.ConfigBase; -import com.seibel.lod.core.config.gui.ConfigScreen; -import com.seibel.lod.core.config.gui.JavaScreenHandlerScreen; -import com.seibel.lod.core.config.gui.OpenGLConfigScreen; +import com.seibel.distanthorizons.core.config.eventHandlers.QuickRenderToggleConfigEventHandler; +import com.seibel.distanthorizons.core.config.eventHandlers.presets.RenderQualityPresetConfigEventHandler; +import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.config.ConfigBase; +import com.seibel.distanthorizons.core.config.gui.ConfigScreen; +import com.seibel.distanthorizons.core.config.gui.JavaScreenHandlerScreen; +import com.seibel.distanthorizons.core.config.gui.OpenGLConfigScreen; import net.minecraft.client.gui.screens.Screen; public class GetConfigScreen diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/LangWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java similarity index 72% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/LangWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java index 13d799f23..6967930da 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/LangWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/LangWrapper.java @@ -1,6 +1,6 @@ -package com.seibel.lod.common.wrappers.gui; +package com.seibel.distanthorizons.common.wrappers.gui; -import com.seibel.lod.core.wrapperInterfaces.config.ILangWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper; import net.minecraft.client.resources.language.I18n; public class LangWrapper implements ILangWrapper { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java similarity index 97% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java index ce9412d37..9210af4a8 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/MinecraftScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java @@ -1,8 +1,8 @@ -package com.seibel.lod.common.wrappers.gui; +package com.seibel.distanthorizons.common.wrappers.gui; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; -import com.seibel.lod.core.config.gui.AbstractScreen; +import com.seibel.distanthorizons.core.config.gui.AbstractScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.screens.Screen; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/TexturedButtonWidget.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java similarity index 98% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/TexturedButtonWidget.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java index a0e867cf8..3fcfb0f92 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/TexturedButtonWidget.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.gui; +package com.seibel.distanthorizons.common.wrappers.gui; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/ChangelogScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java similarity index 94% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/ChangelogScreen.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java index b1dba7415..b0e420145 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/ChangelogScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java @@ -1,11 +1,11 @@ -package com.seibel.lod.common.wrappers.gui.updater; +package com.seibel.distanthorizons.common.wrappers.gui.updater; import com.mojang.blaze3d.vertex.PoseStack; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.jar.installer.MarkdownFormatter; -import com.seibel.lod.core.jar.installer.ModrinthGetter; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.jar.installer.MarkdownFormatter; +import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiComponent; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/UpdateModScreen.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java similarity index 93% rename from common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/UpdateModScreen.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java index adead40ed..01b707080 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/updater/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java @@ -1,13 +1,13 @@ -package com.seibel.lod.common.wrappers.gui.updater; +package com.seibel.distanthorizons.common.wrappers.gui.updater; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.vertex.PoseStack; -import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.jar.JarUtils; -import com.seibel.lod.core.jar.installer.ModrinthGetter; -import com.seibel.lod.core.jar.updater.SelfUpdater; +import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.jar.JarUtils; +import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; +import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ImageButton; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java similarity index 88% rename from common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java index 8d5f5d37f..a892f1be1 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -17,25 +17,25 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.minecraft; +package com.seibel.distanthorizons.common.wrappers.minecraft; import java.io.File; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import com.mojang.blaze3d.platform.NativeImage; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.enums.ELodDirection; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.enums.ELodDirection; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; import net.minecraft.CrashReport; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java similarity index 83% rename from common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java index 885c42570..cb46b0d16 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftDedicatedServerWrapper.java @@ -1,6 +1,6 @@ -package com.seibel.lod.common.wrappers.minecraft; +package com.seibel.distanthorizons.common.wrappers.minecraft; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper; import net.minecraft.server.dedicated.DedicatedServer; import java.io.File; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java similarity index 89% rename from common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java index be11a1494..8d4a1fe0f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftRenderWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.minecraft; +package com.seibel.distanthorizons.common.wrappers.minecraft; import java.awt.Color; import java.lang.invoke.MethodHandles; @@ -28,27 +28,24 @@ import java.util.stream.Collectors; import com.mojang.blaze3d.pipeline.RenderTarget; import com.mojang.blaze3d.platform.NativeImage; import com.mojang.blaze3d.systems.RenderSystem; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.common.wrappers.misc.LightMapWrapper; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.WrapperFactory; +import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; import com.mojang.math.Vector3f; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3d; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.WrapperFactory; -import com.seibel.lod.core.pos.DhBlockPos; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3d; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor; +import com.seibel.distanthorizons.core.pos.DhBlockPos; import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/ProfilerWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java similarity index 91% rename from common/src/main/java/com/seibel/lod/common/wrappers/minecraft/ProfilerWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java index 08a910fb4..caae34b3f 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/ProfilerWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/ProfilerWrapper.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.minecraft; +package com.seibel.distanthorizons.common.wrappers.minecraft; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper; import net.minecraft.util.profiling.ProfilerFiller; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/misc/LightMapWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java similarity index 91% rename from common/src/main/java/com/seibel/lod/common/wrappers/misc/LightMapWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java index fd1f0312e..e66e46211 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/misc/LightMapWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java @@ -17,12 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.misc; +package com.seibel.distanthorizons.common.wrappers.misc; import com.mojang.blaze3d.platform.NativeImage; -import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper; -import net.minecraft.client.renderer.LightTexture; -import org.lwjgl.opengl.GL; +import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper; import org.lwjgl.opengl.GL32; import java.nio.ByteBuffer; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java similarity index 81% rename from common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java index aef7d1592..89d05d57c 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/world/ClientLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java @@ -1,26 +1,24 @@ -package com.seibel.lod.common.wrappers.world; +package com.seibel.distanthorizons.common.wrappers.world; -import com.seibel.lod.api.enums.worldGeneration.EDhApiLevelType; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.block.BiomeWrapper; -import com.seibel.lod.common.wrappers.block.BlockStateWrapper; -import com.seibel.lod.common.wrappers.block.cache.ClientBlockDetailMap; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; +import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; +import com.seibel.distanthorizons.common.wrappers.block.cache.ClientBlockDetailMap; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.players.PlayerList; import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkSource; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java similarity index 92% rename from common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java index d1439bfdb..a3e1ce6a6 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/DimensionTypeWrapper.java @@ -17,15 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.world; +package com.seibel.distanthorizons.common.wrappers.world; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper; -import net.minecraft.world.level.Level; import net.minecraft.world.level.dimension.DimensionType; /** diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java similarity index 81% rename from common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java index f83302226..2aefbae8a 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/world/ServerLevelWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java @@ -17,27 +17,27 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.world; +package com.seibel.distanthorizons.common.wrappers.world; import java.io.File; import java.util.concurrent.ConcurrentHashMap; -import com.seibel.lod.api.enums.worldGeneration.EDhApiLevelType; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.block.BiomeWrapper; -import com.seibel.lod.common.wrappers.block.BlockStateWrapper; -import com.seibel.lod.common.wrappers.block.cache.ServerBlockDetailMap; -import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper; +import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; +import com.seibel.distanthorizons.common.wrappers.block.cache.ServerBlockDetailMap; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.LightLayer; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java similarity index 90% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index cca8e7093..b55d50976 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -18,24 +18,25 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration; +package com.seibel.distanthorizons.common.wrappers.worldGeneration; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.*; -import com.seibel.lod.core.dataObjects.transformers.FullDataToRenderDataTransformer; -import com.seibel.lod.core.level.IDhServerLevel; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.enums.config.ELightGenerationMode; -import com.seibel.lod.core.logging.ConfigBasedLogger; -import com.seibel.lod.core.logging.ConfigBasedSpamLogger; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.util.objects.EventTimer; -import com.seibel.lod.core.util.LodUtil; -import com.seibel.lod.core.util.gridList.ArrayGridList; -import com.seibel.lod.core.util.objects.DhThreadFactory; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.*; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.*; +import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataToRenderDataTransformer; +import com.seibel.distanthorizons.core.level.IDhServerLevel; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.api.enums.config.ELightGenerationMode; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.util.objects.EventTimer; +import com.seibel.distanthorizons.core.util.LodUtil; +import com.seibel.distanthorizons.core.util.gridList.ArrayGridList; +import com.seibel.distanthorizons.core.util.objects.DhThreadFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper; import java.io.IOException; import java.util.*; @@ -45,15 +46,15 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import com.seibel.lod.common.wrappers.DependencySetupDoneCheck; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.common.wrappers.worldGeneration.step.StepBiomes; -import com.seibel.lod.common.wrappers.worldGeneration.step.StepFeatures; -import com.seibel.lod.common.wrappers.worldGeneration.step.StepLight; -import com.seibel.lod.common.wrappers.worldGeneration.step.StepNoise; -import com.seibel.lod.common.wrappers.worldGeneration.step.StepStructureReference; -import com.seibel.lod.common.wrappers.worldGeneration.step.StepStructureStart; -import com.seibel.lod.common.wrappers.worldGeneration.step.StepSurface; +import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepBiomes; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepFeatures; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepLight; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepNoise; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepStructureReference; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepStructureStart; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepSurface; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.ChunkPos; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java similarity index 89% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java index d2eca647c..8a8ac33eb 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GenerationEvent.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration; +package com.seibel.distanthorizons.common.wrappers.worldGeneration; import java.lang.invoke.MethodHandles; import java.util.concurrent.CompletableFuture; @@ -25,14 +25,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import com.seibel.lod.api.enums.worldGeneration.EDhApiWorldGenerationStep; -import com.seibel.lod.core.util.objects.UncheckedInterruptedException; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.api.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; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep; +import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.util.objects.EventTimer; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; import org.apache.logging.log4j.Logger; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GlobalParameters.java similarity index 94% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GlobalParameters.java index 26d7ad092..f2a1e0953 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/GlobalParameters.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration; +package com.seibel.distanthorizons.common.wrappers.worldGeneration; import com.mojang.datafixers.DataFixer; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.level.IDhServerLevel; +import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; +import com.seibel.distanthorizons.core.level.IDhServerLevel; import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/Rolling.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/Rolling.java similarity index 95% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/Rolling.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/Rolling.java index a219c1f42..3b4b95455 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/Rolling.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/Rolling.java @@ -18,7 +18,7 @@ */ -package com.seibel.lod.common.wrappers.worldGeneration; +package com.seibel.distanthorizons.common.wrappers.worldGeneration; //FIXME: Move this outside the WorldGenerationStep thingy public class Rolling diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java similarity index 91% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java index f750a33fb..57f2fbc40 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/ThreadedParameters.java @@ -18,10 +18,10 @@ */ -package com.seibel.lod.common.wrappers.worldGeneration; +package com.seibel.distanthorizons.common.wrappers.worldGeneration; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PerfCalculator; -import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenStructFeatManager; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment.PerfCalculator; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.WorldGenStructFeatManager; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.WorldGenLevel; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java similarity index 98% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java index efb8ca4e1..65dd27d83 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject; import com.mojang.serialization.Codec; import com.mojang.serialization.Dynamic; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.core.logging.ConfigBasedLogger; +import com.seibel.distanthorizons.core.logging.ConfigBasedLogger; import java.util.Objects; @@ -52,7 +52,6 @@ import net.minecraft.core.Holder; import net.minecraft.world.level.lighting.LevelLightEngine; import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.Fluids; public class ChunkLoader { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java similarity index 88% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java index 83170df85..6d2fbee11 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightGetterAdaptor.java @@ -17,10 +17,10 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IStarlightAccessor; import net.minecraft.world.level.BlockGetter; #if POST_MC_1_17_1 diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java similarity index 96% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java index dc6830124..9d7a306cd 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java @@ -17,20 +17,18 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject; import java.lang.invoke.MethodHandles; import java.util.List; -import com.seibel.lod.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.SpawnerBlock; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.EmptyChunkGenerator; -import com.seibel.lod.api.enums.config.ELightGenerationMode; - import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -54,7 +52,6 @@ import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.ImposterProtoChunk; import net.minecraft.world.level.chunk.LevelChunk; -import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.lighting.LevelLightEngine; public class LightedWorldGenRegion extends WorldGenRegion @@ -62,7 +59,7 @@ public class LightedWorldGenRegion extends WorldGenRegion private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName()); public final WorldGenLevelLightEngine light; - public final EmptyChunkGenerator generator; + public final BatchGenerationEnvironment.EmptyChunkGenerator generator; public final int writeRadius; public final int size; private final ChunkPos firstPos; @@ -92,7 +89,7 @@ public class LightedWorldGenRegion extends WorldGenRegion public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine, List chunkList, ChunkStatus chunkStatus, int writeRadius, - EmptyChunkGenerator generator) + BatchGenerationEnvironment.EmptyChunkGenerator generator) { super(serverLevel, chunkList #if POST_MC_1_17_1, chunkStatus, writeRadius #endif); this.firstPos = chunkList.get(0).getPos(); diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java similarity index 94% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java index 171369116..29aa8453d 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java @@ -1,6 +1,6 @@ -package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; import net.minecraft.world.level.ChunkPos; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java similarity index 98% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java index 3de425aa8..19f46fd7b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java similarity index 96% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java index 5813e6cce..f24cc8834 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java @@ -17,33 +17,27 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.mimicObject; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; import com.google.common.collect.ImmutableList; -import it.unimi.dsi.fastutil.longs.LongIterator; import it.unimi.dsi.fastutil.longs.LongSet; import net.minecraft.core.BlockPos; import net.minecraft.core.SectionPos; import net.minecraft.server.level.WorldGenRegion; -import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.levelgen.WorldGenSettings; #if PRE_MC_1_19 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; -import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraft.world.level.StructureFeatureManager; #else import net.minecraft.world.level.levelgen.structure.Structure; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java similarity index 81% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java index e6667afb5..5c07c1dc9 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepBiomes.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java @@ -17,27 +17,20 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.step; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.step; import java.util.ArrayList; import java.util.List; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters; -import net.minecraft.core.Registry; import net.minecraft.server.level.WorldGenRegion; #if PRE_MC_1_19 -import net.minecraft.world.level.StructureFeatureManager; #endif -import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.ProtoChunk; -import net.minecraft.world.level.levelgen.DebugLevelSource; -import net.minecraft.world.level.levelgen.FlatLevelSource; -import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator; #if POST_MC_1_18_1 import net.minecraft.world.level.levelgen.blending.Blender; #endif diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepFeatures.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java similarity index 83% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepFeatures.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java index ba0342677..ca4accc34 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepFeatures.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java @@ -17,23 +17,21 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.step; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.step; import java.util.ArrayList; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; -import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion; -import com.seibel.lod.core.util.gridList.ArrayGridList; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion; +import com.seibel.distanthorizons.core.util.gridList.ArrayGridList; import net.minecraft.ReportedException; -import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.ProtoChunk; import net.minecraft.world.level.levelgen.Heightmap; -#if POST_MC_1_18_1 -import net.minecraft.world.level.levelgen.blending.Blender; +#if POST_MC_1_18_1 #endif public final class StepFeatures { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepLight.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepLight.java similarity index 88% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepLight.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepLight.java index 9a49c8e41..760ae807a 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepLight.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepLight.java @@ -17,18 +17,17 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.step; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.step; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenLevelLightEngine; -import com.seibel.lod.core.util.gridList.ArrayGridList; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.WorldGenLevelLightEngine; +import com.seibel.distanthorizons.core.util.gridList.ArrayGridList; import net.minecraft.server.level.ThreadedLevelLightEngine; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.LevelChunk; import net.minecraft.world.level.chunk.ProtoChunk; -import net.minecraft.world.level.lighting.LevelLightEngine; import net.minecraft.world.level.lighting.LightEventListener; public final class StepLight { diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java similarity index 89% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java index a345629ed..708e2df1e 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepNoise.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.step; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.step; import java.util.ArrayList; import java.util.List; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters; -import com.seibel.lod.core.util.objects.UncheckedInterruptedException; +import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException; import net.minecraft.server.level.WorldGenRegion; #if POST_MC_1_17_1 #endif diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java similarity index 78% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java index e158e0529..398a3a2e0 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureReference.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java @@ -17,28 +17,20 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.step; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.step; import java.util.ArrayList; import java.util.List; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters; -import net.minecraft.CrashReport; -import net.minecraft.CrashReportCategory; -import net.minecraft.ReportedException; -import net.minecraft.core.Registry; -import net.minecraft.core.SectionPos; import net.minecraft.server.level.WorldGenRegion; -import net.minecraft.world.level.ChunkPos; #if PRE_MC_1_19 -import net.minecraft.world.level.StructureFeatureManager; #endif import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.ProtoChunk; -import net.minecraft.world.level.levelgen.structure.StructureStart; public final class StepStructureReference { /** diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java similarity index 92% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java index ec1dd313d..918dff14b 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepStructureStart.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java @@ -17,16 +17,15 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.step; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.step; -import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters; -import com.seibel.lod.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java similarity index 89% rename from common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java rename to common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java index b90db717e..8ad23bad3 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepSurface.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java @@ -17,13 +17,13 @@ * along with this program. If not, see . */ -package com.seibel.lod.common.wrappers.worldGeneration.step; +package com.seibel.distanthorizons.common.wrappers.worldGeneration.step; import java.util.ArrayList; import java.util.List; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters; import net.minecraft.server.level.WorldGenRegion; import net.minecraft.world.level.chunk.ChunkAccess; diff --git a/common/src/main/resources/1_16.lod.accesswidener b/common/src/main/resources/1_16.distanthorizons.accesswidener similarity index 100% rename from common/src/main/resources/1_16.lod.accesswidener rename to common/src/main/resources/1_16.distanthorizons.accesswidener diff --git a/common/src/main/resources/1_17.lod.accesswidener b/common/src/main/resources/1_17.distanthorizons.accesswidener similarity index 100% rename from common/src/main/resources/1_17.lod.accesswidener rename to common/src/main/resources/1_17.distanthorizons.accesswidener diff --git a/common/src/main/resources/1_18.lod.accesswidener b/common/src/main/resources/1_18.distanthorizons.accesswidener similarity index 100% rename from common/src/main/resources/1_18.lod.accesswidener rename to common/src/main/resources/1_18.distanthorizons.accesswidener diff --git a/common/src/main/resources/1_19.lod.accesswidener b/common/src/main/resources/1_19.distanthorizons.accesswidener similarity index 100% rename from common/src/main/resources/1_19.lod.accesswidener rename to common/src/main/resources/1_19.distanthorizons.accesswidener diff --git a/coreSubProjects b/coreSubProjects index 5c2f89a0a..594f42a88 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 5c2f89a0a5cdced358fab663cba904f310e5bf8c +Subproject commit 594f42a889dd2f743faa07517b503a8d0f91eff7 diff --git a/fabric/build.gradle b/fabric/build.gradle index 76310e06d..bcfee4b26 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -3,7 +3,7 @@ plugins { } loom { - accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener") + accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener") // "runs" isn't required, but when we do need it then it can be useful runs { diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricClientMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientMain.java similarity index 88% rename from fabric/src/main/java/com/seibel/lod/fabric/FabricClientMain.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientMain.java index 15e16cf28..ca773600c 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricClientMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientMain.java @@ -1,6 +1,6 @@ -package com.seibel.lod.fabric; +package com.seibel.distanthorizons.fabric; -import com.seibel.lod.common.wrappers.DependencySetup; +import com.seibel.distanthorizons.common.wrappers.DependencySetup; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricClientProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java similarity index 89% rename from fabric/src/main/java/com/seibel/lod/fabric/FabricClientProxy.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java index 847e8f1bb..17818f2c3 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricClientProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java @@ -17,22 +17,22 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric; +package com.seibel.distanthorizons.fabric; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.ClientApi; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.api.internal.ClientApi; import com.mojang.blaze3d.platform.InputConstants; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; -import com.seibel.lod.fabric.wrappers.modAccessor.ImmersivePortalsAccessor; -import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor; +import com.seibel.distanthorizons.fabric.wrappers.modAccessor.ImmersivePortalsAccessor; +import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricDedicatedServerMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricDedicatedServerMain.java similarity index 83% rename from fabric/src/main/java/com/seibel/lod/fabric/FabricDedicatedServerMain.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricDedicatedServerMain.java index 1bbc05b5f..db81ee969 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricDedicatedServerMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricDedicatedServerMain.java @@ -1,8 +1,8 @@ -package com.seibel.lod.fabric; +package com.seibel.distanthorizons.fabric; -import com.seibel.lod.common.wrappers.DependencySetup; -import com.seibel.lod.common.wrappers.minecraft.MinecraftDedicatedServerWrapper; -import com.seibel.lod.core.util.LodUtil; +import com.seibel.distanthorizons.common.wrappers.DependencySetup; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftDedicatedServerWrapper; +import com.seibel.distanthorizons.core.util.LodUtil; import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java similarity index 76% rename from fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java index c0450685a..e49dece1a 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricMain.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java @@ -17,20 +17,21 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric; +package com.seibel.distanthorizons.fabric; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; -import com.seibel.lod.common.LodCommonMain; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.*; -import com.seibel.lod.fabric.wrappers.modAccessor.*; -import com.seibel.lod.fabric.wrappers.FabricDependencySetup; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.*; +import com.seibel.distanthorizons.common.LodCommonMain; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.fabric.wrappers.FabricDependencySetup; +import com.seibel.distanthorizons.fabric.wrappers.modAccessor.*; +import com.seibel.distanthorizons.fabric.wrappers.modAccessor.*; import org.apache.logging.log4j.Logger; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java similarity index 85% rename from fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java index 3d07d12c6..71e006f31 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/FabricServerProxy.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java @@ -1,13 +1,13 @@ -package com.seibel.lod.fabric; +package com.seibel.distanthorizons.fabric; -import com.seibel.lod.common.networking.Networking; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.core.api.internal.ServerApi; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.world.ILevelWrapper; +import com.seibel.distanthorizons.common.networking.Networking; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.core.api.internal.ServerApi; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/FabricMixinPlugin.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/FabricMixinPlugin.java similarity index 85% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/FabricMixinPlugin.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/FabricMixinPlugin.java index 6fb6bfc3e..eaf87acd5 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/FabricMixinPlugin.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/FabricMixinPlugin.java @@ -1,7 +1,5 @@ -package com.seibel.lod.fabric.mixins; +package com.seibel.distanthorizons.fabric.mixins; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; import net.fabricmc.loader.api.FabricLoader; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; @@ -23,7 +21,7 @@ public class FabricMixinPlugin implements IMixinConfigPlugin { return FabricLoader.getInstance().isModLoaded( mixinClassName // What these 2 regex's do is get the mod name that we are checking out of the mixinClassName - // Eg. "com.seibel.lod.mixins.mods.sodium.MixinSodiumChunkRenderer" turns into "sodium" + // Eg. "com.seibel.distanthorizons.mixins.mods.sodium.MixinSodiumChunkRenderer" turns into "sodium" .replaceAll("^.*mods.", "") // Replaces everything before the mods .replaceAll("\\..*$", "") // Replaces everything after the mod name ); diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java similarity index 90% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java index 801140e63..f309d2f38 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientLevel.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.ClientApi; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.api.internal.ClientApi; import net.minecraft.client.multiplayer.ClientLevel; #if POST_MC_1_18_2 #endif diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientPacketListener.java similarity index 91% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientPacketListener.java index 7bfba6905..fbfcf41ce 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinClientPacketListener.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientPacketListener.java @@ -1,7 +1,7 @@ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.ClientApi; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.api.internal.ClientApi; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientPacketListener; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinDebugScreenOverlay.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java similarity index 84% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinDebugScreenOverlay.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java index 28fd7658b..ed36a4c57 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinDebugScreenOverlay.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java @@ -1,6 +1,6 @@ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.lod.core.logging.f3.F3Screen; +import com.seibel.distanthorizons.core.logging.f3.F3Screen; import net.minecraft.client.gui.components.DebugScreenOverlay; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java index be2b9eabf..a9f0d2b72 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinFogRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.core.config.Config; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinGameRenderer.java similarity index 93% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinGameRenderer.java index ca204659c..54356697f 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinGameRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinGameRenderer.java @@ -1,6 +1,6 @@ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.lod.core.api.internal.ClientApi; +import com.seibel.distanthorizons.core.api.internal.ClientApi; import net.minecraft.client.renderer.GameRenderer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java index 77df802f7..2339808bf 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLevelRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.core.config.Config; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLightmap.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java similarity index 86% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLightmap.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java index ba6963ad6..0aeead8ce 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLightmap.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightmap.java @@ -1,8 +1,8 @@ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; import com.mojang.blaze3d.platform.NativeImage; -import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; import net.minecraft.client.renderer.LightTexture; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java similarity index 78% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java index f5ce1334c..f3d29669c 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinMinecraft.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinMinecraft.java @@ -1,11 +1,11 @@ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.lod.common.wrappers.gui.updater.UpdateModScreen; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.jar.installer.ModrinthGetter; -import com.seibel.lod.core.jar.updater.SelfUpdater; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; +import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java similarity index 90% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java index 78567c04a..3391a5547 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinOptionsScreen.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinOptionsScreen.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; -import com.seibel.lod.common.wrappers.gui.GetConfigScreen; -import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; +import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.config.Config; import net.minecraft.client.gui.screens.OptionsScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinTextureUtil.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java similarity index 90% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinTextureUtil.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java index a7b44bda6..6335fcd43 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinTextureUtil.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java @@ -1,8 +1,8 @@ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.fabric.mixins.client; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.TextureUtil; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.core.config.Config; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinBlockUpdate.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinBlockUpdate.java index 0aa6a3452..ac794fb4f 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinBlockUpdate.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.events; +package com.seibel.distanthorizons.fabric.mixins.events; import net.minecraft.core.BlockPos; import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinServerLevel.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinServerLevel.java index 678163a79..c38f2fa10 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinServerLevel.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/events/MixinServerLevel.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.events; +package com.seibel.distanthorizons.fabric.mixins.events; import net.minecraft.server.level.ServerLevel; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/imm_ptl_core/MixinImmersivePortalsGameRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/mods/imm_ptl_core/MixinImmersivePortalsGameRenderer.java similarity index 77% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/imm_ptl_core/MixinImmersivePortalsGameRenderer.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/mods/imm_ptl_core/MixinImmersivePortalsGameRenderer.java index 478489215..076f8cc80 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/imm_ptl_core/MixinImmersivePortalsGameRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/mods/imm_ptl_core/MixinImmersivePortalsGameRenderer.java @@ -1,20 +1,20 @@ -package com.seibel.lod.fabric.mixins.mods.imm_ptl_core; +package com.seibel.distanthorizons.fabric.mixins.mods.imm_ptl_core; // TODO: Fix this eventually /* import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Vector3f; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.ClientApi; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.coreapi.util.math.Vec3f; -import com.seibel.lod.fabric.wrappers.modAccessor.ImmersivePortalsAccessor; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.api.internal.ClientApi; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.coreapi.util.math.Vec3f; +import com.seibel.distanthorizons.fabric.wrappers.modAccessor.ImmersivePortalsAccessor; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.GameRenderer; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java similarity index 83% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java index 27ae4d231..de6272afe 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/mods/sodium/MixinSodiumChunkRenderer.java @@ -1,9 +1,9 @@ -package com.seibel.lod.fabric.mixins.mods.sodium; +package com.seibel.distanthorizons.fabric.mixins.mods.sodium; -import com.seibel.lod.core.api.internal.ClientApi; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; -import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor; +import com.seibel.distanthorizons.core.api.internal.ClientApi; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor; +import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor; import me.jellysquid.mods.sodium.client.gl.device.CommandList; import me.jellysquid.mods.sodium.client.render.chunk.ChunkCameraContext; import me.jellysquid.mods.sodium.client.render.chunk.ChunkRenderList; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkGenerator.java similarity index 97% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkGenerator.java index 4fae15c45..6d7e961d9 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkGenerator.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkGenerator.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.server; +package com.seibel.distanthorizons.fabric.mixins.server; import org.spongepowered.asm.mixin.Mixin; import net.minecraft.world.level.chunk.ChunkGenerator; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java similarity index 82% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java index a43432d55..348b1d6f2 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinChunkMap.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinChunkMap.java @@ -1,8 +1,8 @@ -package com.seibel.lod.fabric.mixins.server; +package com.seibel.distanthorizons.fabric.mixins.server; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.core.api.internal.ServerApi; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; +import com.seibel.distanthorizons.core.api.internal.ServerApi; import net.minecraft.server.level.ChunkMap; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.chunk.ChunkAccess; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinUtilBackgroundThread.java similarity index 93% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinUtilBackgroundThread.java index a7e175dc2..eb1d2e055 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/MixinUtilBackgroundThread.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinUtilBackgroundThread.java @@ -17,18 +17,18 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.server; +package com.seibel.distanthorizons.fabric.mixins.server; import java.util.concurrent.ExecutorService; import java.util.function.Supplier; -import com.seibel.lod.fabric.FabricServerProxy; +import com.seibel.distanthorizons.fabric.FabricServerProxy; 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; -import com.seibel.lod.core.util.objects.DummyRunExecutorService; +import com.seibel.distanthorizons.core.util.objects.DummyRunExecutorService; import net.minecraft.Util; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java similarity index 96% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java index 8496c6b50..22f0ad6c7 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/server/unsafe/MixinThreadingDetector.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.mixins.server.unsafe; +package com.seibel.distanthorizons.fabric.mixins.server.unsafe; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/FabricDependencySetup.java similarity index 81% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/FabricDependencySetup.java index 16ad9fed9..23c099525 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/FabricDependencySetup.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/FabricDependencySetup.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.wrappers; +package com.seibel.distanthorizons.fabric.wrappers; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; -import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; +import com.seibel.distanthorizons.fabric.wrappers.modAccessor.ModChecker; /** * Binds all necessary dependencies, so we diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java similarity index 90% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java index 25a9f40e6..ef18e59f3 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.wrappers.config; +package com.seibel.distanthorizons.fabric.wrappers.config; -import com.seibel.lod.common.wrappers.gui.GetConfigScreen; +import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java similarity index 73% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java index ae8014e5f..0419bd83a 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/BCLibAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java @@ -1,12 +1,9 @@ -package com.seibel.lod.fabric.wrappers.modAccessor; +package com.seibel.distanthorizons.fabric.wrappers.modAccessor; #if POST_MC_1_17_1 -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IBCLibAccessor; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IBCLibAccessor; import ru.bclib.config.ClientConfig; import ru.bclib.config.Configs; -import ru.bclib.util.BackgroundInfo; - -import java.awt.*; public class BCLibAccessor implements IBCLibAccessor { @Override diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ImmersivePortalsAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ImmersivePortalsAccessor.java similarity index 56% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ImmersivePortalsAccessor.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ImmersivePortalsAccessor.java index 9653624ae..eeaab44f6 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ImmersivePortalsAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ImmersivePortalsAccessor.java @@ -1,6 +1,6 @@ -package com.seibel.lod.fabric.wrappers.modAccessor; +package com.seibel.distanthorizons.fabric.wrappers.modAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor; public class ImmersivePortalsAccessor implements IImmersivePortalsAccessor { @Override diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java similarity index 88% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java index 17759e027..01e18ac37 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/ModChecker.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.wrappers.modAccessor; +package com.seibel.distanthorizons.fabric.wrappers.modAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; import net.fabricmc.loader.api.FabricLoader; public class ModChecker implements IModChecker { diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java similarity index 81% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java index 0d2c838fb..1fe0375e2 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/OptifineAccessor.java @@ -17,13 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.wrappers.modAccessor; +package com.seibel.distanthorizons.fabric.wrappers.modAccessor; import java.util.HashSet; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; public class OptifineAccessor extends AbstractOptifineAccessor { diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java similarity index 87% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java index 7ffd15403..33c13c956 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -17,20 +17,20 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.wrappers.modAccessor; +package com.seibel.distanthorizons.fabric.wrappers.modAccessor; import java.util.HashSet; import java.util.stream.Collectors; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.coreapi.util.math.Mat4f; -import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory; -import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory; +import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer; import net.minecraft.client.Minecraft; #if PRE_MC_1_17_1 diff --git a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/StarlightAccessor.java similarity index 86% rename from fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java rename to fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/StarlightAccessor.java index 727a558ae..dc7aadce3 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/StarlightAccessor.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.fabric.wrappers.modAccessor; +package com.seibel.distanthorizons.fabric.wrappers.modAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IStarlightAccessor; public class StarlightAccessor implements IStarlightAccessor { diff --git a/fabric/src/main/resources/DistantHorizons.fabric.mixins.json b/fabric/src/main/resources/DistantHorizons.fabric.mixins.json index f4b268eec..6bc79df81 100644 --- a/fabric/src/main/resources/DistantHorizons.fabric.mixins.json +++ b/fabric/src/main/resources/DistantHorizons.fabric.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.seibel.lod.fabric.mixins", + "package": "com.seibel.distanthorizons.fabric.mixins", "mixins": [ "server.unsafe.MixinThreadingDetector", "server.MixinChunkGenerator", @@ -26,5 +26,5 @@ "injectors": { "defaultRequire": 1 }, - "plugin": "com.seibel.lod.fabric.mixins.FabricMixinPlugin" + "plugin": "com.seibel.distanthorizons.fabric.mixins.FabricMixinPlugin" } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index c738c5377..7e6907fd7 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -1,6 +1,6 @@ { "schemaVersion": 1, - "id": "lod", + "id": "distanthorizons", "version": "${version}", "name": "${mod_name}", @@ -16,19 +16,19 @@ "license": "LGPL-3", "icon": "icon.png", - "accessWidener": "lod.accesswidener", + "accessWidener": "distanthorizons.accesswidener", "environment": "*", "entrypoints": { "client": [ - "com.seibel.lod.fabric.FabricClientMain" + "com.seibel.distanthorizons.fabric.FabricClientMain" ], "server": [ - "com.seibel.lod.fabric.FabricDedicatedServerMain" + "com.seibel.distanthorizons.fabric.FabricDedicatedServerMain" ], "modmenu": [ - "com.seibel.lod.fabric.wrappers.config.ModMenuIntegration" + "com.seibel.distanthorizons.fabric.wrappers.config.ModMenuIntegration" ] }, diff --git a/forge/build.gradle b/forge/build.gradle index 13d3fecf0..4049ddb91 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -18,7 +18,7 @@ architectury { //} loom { - accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.lod.accesswidener") + accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener") forge { convertAccessWideners = true diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java similarity index 93% rename from forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java index 7a0327322..27f9932a9 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java @@ -17,24 +17,23 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge; +package com.seibel.distanthorizons.forge; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.ClientApi; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.api.internal.ClientApi; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraftforge.event.world.ChunkDataEvent; import org.apache.logging.log4j.Logger; import org.lwjgl.glfw.GLFW; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.event.world.WorldEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; /** diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java similarity index 82% rename from forge/src/main/java/com/seibel/lod/forge/ForgeMain.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java index 6574db0a9..a8b286ab4 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeMain.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java @@ -17,24 +17,24 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge; +package com.seibel.distanthorizons.forge; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; -import com.seibel.lod.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; -import com.seibel.lod.common.LodCommonMain; -import com.seibel.lod.common.forge.LodForgeMethodCaller; -import com.seibel.lod.common.wrappers.DependencySetup; -import com.seibel.lod.common.wrappers.gui.GetConfigScreen; -import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper; -import com.seibel.lod.coreapi.DependencyInjection.ApiEventInjector; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.ReflectionHandler; -import com.seibel.lod.core.dependencyInjection.ModAccessorInjector; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; -import com.seibel.lod.forge.wrappers.ForgeDependencySetup; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; +import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; +import com.seibel.distanthorizons.common.LodCommonMain; +import com.seibel.distanthorizons.common.forge.LodForgeMethodCaller; +import com.seibel.distanthorizons.common.wrappers.DependencySetup; +import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper; +import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.ReflectionHandler; +import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor; +import com.seibel.distanthorizons.forge.wrappers.ForgeDependencySetup; -import com.seibel.lod.forge.wrappers.modAccessor.OptifineAccessor; +import com.seibel.distanthorizons.forge.wrappers.modAccessor.OptifineAccessor; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.core.Direction; diff --git a/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java similarity index 88% rename from forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java index 821b336ed..a366e2558 100644 --- a/forge/src/main/java/com/seibel/lod/forge/ForgeServerProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java @@ -1,12 +1,12 @@ -package com.seibel.lod.forge; +package com.seibel.distanthorizons.forge; -import com.seibel.lod.common.networking.Networking; -import com.seibel.lod.common.wrappers.chunk.ChunkWrapper; -import com.seibel.lod.common.wrappers.world.ServerLevelWrapper; -import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment; -import com.seibel.lod.core.api.internal.ServerApi; -import com.seibel.lod.core.logging.DhLoggerBuilder; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; +import com.seibel.distanthorizons.common.networking.Networking; +import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; +import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper; +import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment; +import com.seibel.distanthorizons.core.api.internal.ServerApi; +import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; +import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.network.FriendlyByteBuf; @@ -15,7 +15,6 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.server.ServerAboutToStartEvent; -import net.minecraftforge.event.server.ServerStartedEvent; import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.WorldEvent; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/ForgeMixinPlugin.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/ForgeMixinPlugin.java similarity index 90% rename from forge/src/main/java/com/seibel/lod/forge/mixins/ForgeMixinPlugin.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/ForgeMixinPlugin.java index cd5d6c841..31a6ff6fc 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/ForgeMixinPlugin.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/ForgeMixinPlugin.java @@ -1,4 +1,4 @@ -package com.seibel.lod.forge.mixins; +package com.seibel.distanthorizons.forge.mixins; import net.minecraftforge.fml.ModList; import org.objectweb.asm.tree.ClassNode; @@ -20,7 +20,7 @@ public class ForgeMixinPlugin implements IMixinConfigPlugin { return ModList.get().isLoaded( mixinClassName // What these 2 regex's do is get the mod name that we are checking out of the mixinClassName - // Eg. "com.seibel.lod.mixins.mods.sodium.MixinSodiumChunkRenderer" turns into "sodium" + // Eg. "com.seibel.distanthorizons.mixins.mods.sodium.MixinSodiumChunkRenderer" turns into "sodium" .replaceAll("^.*mods.", "") // Replaces everything before the mods .replaceAll("\\..*$", "") // Replaces everything after the mod name ); diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinClientPacketListener.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java similarity index 91% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinClientPacketListener.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java index 9f11656c4..34ba3747c 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinClientPacketListener.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java @@ -1,7 +1,7 @@ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.api.internal.ClientApi; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.api.internal.ClientApi; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.multiplayer.ClientPacketListener; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDebugScreenOverlay.java similarity index 84% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDebugScreenOverlay.java index 3e97b5215..7f9e41e7a 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinDebugScreenOverlay.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDebugScreenOverlay.java @@ -1,6 +1,6 @@ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.lod.core.logging.f3.F3Screen; +import com.seibel.distanthorizons.core.logging.f3.F3Screen; import net.minecraft.client.gui.components.DebugScreenOverlay; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java similarity index 96% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java index ace2b6b5a..fcf609988 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinFogRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.core.config.Config; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinGameRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinGameRenderer.java similarity index 93% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinGameRenderer.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinGameRenderer.java index 2fecf88c4..98e1ac33e 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinGameRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinGameRenderer.java @@ -1,6 +1,6 @@ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.lod.core.api.internal.ClientApi; +import com.seibel.distanthorizons.core.api.internal.ClientApi; import net.minecraft.client.renderer.GameRenderer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java similarity index 92% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java index 763ddb163..0e6c2bc3f 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinLevelRenderer.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java @@ -17,15 +17,15 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.world.ClientLevelWrapper; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.api.internal.ClientApi; -import com.seibel.lod.coreapi.util.math.Mat4f; +import com.seibel.distanthorizons.common.wrappers.McObjectConverter; +import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.api.internal.ClientApi; +import com.seibel.distanthorizons.coreapi.util.math.Mat4f; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.RenderType; diff --git a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java similarity index 86% rename from fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java index fc909c5ed..9407bebba 100644 --- a/fabric/src/main/java/com/seibel/lod/fabric/mixins/client/MixinLightmap.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightmap.java @@ -1,8 +1,8 @@ -package com.seibel.lod.fabric.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; import com.mojang.blaze3d.platform.NativeImage; -import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper; +import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; import net.minecraft.client.renderer.LightTexture; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinMinecraft.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java similarity index 78% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinMinecraft.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java index bc9684194..cb205e03e 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinMinecraft.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java @@ -1,11 +1,11 @@ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.lod.common.wrappers.gui.updater.UpdateModScreen; -import com.seibel.lod.core.config.Config; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.jar.installer.ModrinthGetter; -import com.seibel.lod.core.jar.updater.SelfUpdater; -import com.seibel.lod.core.wrapperInterfaces.IVersionConstants; +import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; +import com.seibel.distanthorizons.core.config.Config; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter; +import com.seibel.distanthorizons.core.jar.updater.SelfUpdater; +import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java similarity index 90% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java index 7d2bb276c..58a2ffa13 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinOptionsScreen.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java @@ -17,12 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.lod.common.wrappers.gui.GetConfigScreen; -import com.seibel.lod.common.wrappers.gui.TexturedButtonWidget; -import com.seibel.lod.coreapi.ModInfo; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; +import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget; +import com.seibel.distanthorizons.coreapi.ModInfo; +import com.seibel.distanthorizons.core.config.Config; import net.minecraft.client.gui.screens.OptionsScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinTextureUtil.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java similarity index 90% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinTextureUtil.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java index 4f4936f48..c451a0534 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinTextureUtil.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java @@ -1,8 +1,8 @@ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.TextureUtil; -import com.seibel.lod.core.config.Config; +import com.seibel.distanthorizons.core.config.Config; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinWorldUpgrader.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinWorldUpgrader.java similarity index 81% rename from forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinWorldUpgrader.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinWorldUpgrader.java index 41d26cfe7..722fd49ce 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/client/MixinWorldUpgrader.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinWorldUpgrader.java @@ -1,21 +1,16 @@ -package com.seibel.lod.forge.mixins.client; +package com.seibel.distanthorizons.forge.mixins.client; -import com.seibel.lod.api.enums.worldGeneration.EDhApiLevelType; -import com.seibel.lod.api.interfaces.world.IDhApiDimensionTypeWrapper; -import com.seibel.lod.common.wrappers.McObjectConverter; -import com.seibel.lod.common.wrappers.block.BlockStateWrapper; -import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper; -import com.seibel.lod.core.file.structure.LocalSaveStructure; -import com.seibel.lod.core.level.DhServerLevel; -import com.seibel.lod.core.pos.DhBlockPos; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.block.IBlockStateWrapper; -import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IClientLevelWrapper; -import com.seibel.lod.core.wrapperInterfaces.world.IServerLevelWrapper; -import net.minecraft.client.Minecraft; -import net.minecraft.core.Registry; +import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType; +import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper; +import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper; +import com.seibel.distanthorizons.common.wrappers.world.DimensionTypeWrapper; +import com.seibel.distanthorizons.core.file.structure.LocalSaveStructure; +import com.seibel.distanthorizons.core.level.DhServerLevel; +import com.seibel.distanthorizons.core.pos.DhBlockPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; +import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper; import net.minecraft.resources.ResourceKey; import net.minecraft.util.worldupdate.WorldUpgrader; import net.minecraft.world.level.Level; @@ -24,7 +19,6 @@ import net.minecraft.world.level.dimension.LevelStem; import net.minecraft.world.level.levelgen.WorldGenSettings; import net.minecraft.world.level.storage.DimensionDataStorage; import net.minecraft.world.level.storage.LevelStorageSource; -import net.minecraft.world.level.storage.LevelSummary; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinChunkGenerator.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinChunkGenerator.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java index 0697f7ddd..5c6b295a9 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinChunkGenerator.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.mixins.server; +package com.seibel.distanthorizons.forge.mixins.server; import org.spongepowered.asm.mixin.Mixin; import net.minecraft.world.level.chunk.ChunkGenerator; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinTFChunkGenerator.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinTFChunkGenerator.java similarity index 97% rename from forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinTFChunkGenerator.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinTFChunkGenerator.java index 225df7129..db7894f63 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinTFChunkGenerator.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinTFChunkGenerator.java @@ -1,4 +1,4 @@ -package com.seibel.lod.forge.mixins.server; +package com.seibel.distanthorizons.forge.mixins.server; import net.minecraft.world.level.chunk.ChunkGenerator; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinUtilBackgroundThread.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java similarity index 92% rename from forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinUtilBackgroundThread.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java index f77a15c81..59606495d 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/server/MixinUtilBackgroundThread.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.mixins.server; +package com.seibel.distanthorizons.forge.mixins.server; import java.util.concurrent.ExecutorService; import java.util.function.Supplier; @@ -27,8 +27,8 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.seibel.lod.common.wrappers.DependencySetupDoneCheck; -import com.seibel.lod.core.util.objects.DummyRunExecutorService; +import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck; +import com.seibel.distanthorizons.core.util.objects.DummyRunExecutorService; import net.minecraft.Util; diff --git a/forge/src/main/java/com/seibel/lod/forge/mixins/server/unsafe/MixinThreadingDetector.java b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java similarity index 96% rename from forge/src/main/java/com/seibel/lod/forge/mixins/server/unsafe/MixinThreadingDetector.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java index 2e9090546..09115940a 100644 --- a/forge/src/main/java/com/seibel/lod/forge/mixins/server/unsafe/MixinThreadingDetector.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.mixins.server.unsafe; +package com.seibel.distanthorizons.forge.mixins.server.unsafe; import org.spongepowered.asm.mixin.Mixin; #if POST_MC_1_18_1 diff --git a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java similarity index 81% rename from forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java index aefa4d9cc..b0d94b829 100644 --- a/forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.wrappers; +package com.seibel.distanthorizons.forge.wrappers; -import com.seibel.lod.core.dependencyInjection.SingletonInjector; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; -import com.seibel.lod.forge.wrappers.modAccessor.ModChecker; +import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; +import com.seibel.distanthorizons.forge.wrappers.modAccessor.ModChecker; /** * Binds all necessary dependencies so we diff --git a/forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/ModChecker.java b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java similarity index 88% rename from forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/ModChecker.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java index 17b640d80..6b91daca7 100644 --- a/forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/ModChecker.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java @@ -17,9 +17,9 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.wrappers.modAccessor; +package com.seibel.distanthorizons.forge.wrappers.modAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; import net.minecraftforge.fml.ModList; public class ModChecker implements IModChecker { diff --git a/forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/OptifineAccessor.java b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java similarity index 81% rename from forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/OptifineAccessor.java rename to forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java index 8e2ec08fc..4ffb64751 100644 --- a/forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/OptifineAccessor.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java @@ -17,13 +17,12 @@ * along with this program. If not, see . */ -package com.seibel.lod.forge.wrappers.modAccessor; +package com.seibel.distanthorizons.forge.wrappers.modAccessor; import java.util.HashSet; -import com.seibel.lod.core.pos.DhChunkPos; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; -import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor; +import com.seibel.distanthorizons.core.pos.DhChunkPos; +import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor; public class OptifineAccessor extends AbstractOptifineAccessor { diff --git a/forge/src/main/resources/DistantHorizons.mixins.json b/forge/src/main/resources/DistantHorizons.mixins.json index b3c80d092..83bfe64e2 100644 --- a/forge/src/main/resources/DistantHorizons.mixins.json +++ b/forge/src/main/resources/DistantHorizons.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.seibel.lod.forge.mixins", + "package": "com.seibel.distanthorizons.forge.mixins", "mixins": [ "server.unsafe.MixinThreadingDetector", "server.MixinUtilBackgroundThread", @@ -19,5 +19,5 @@ "client.MixinTextureUtil" ], "server": [], - "plugin": "com.seibel.lod.forge.mixins.ForgeMixinPlugin" + "plugin": "com.seibel.distanthorizons.forge.mixins.ForgeMixinPlugin" } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 3f3067815..a9dccfc67 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -6,7 +6,7 @@ issueTrackerURL="${issues}" [[mods]] #//mandatory - modId="lod" #//mandatory + modId="distanthorizons" #//mandatory version= "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script displayName="${mod_name}" #//mandatory authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"] @@ -25,7 +25,7 @@ issueTrackerURL="${issues}" acceptableRemoteVersions="*" -[[dependencies.lod]] +[[dependencies.distanthorizons]] modId="minecraft" mandatory=true versionRange="${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for diff --git a/gradle.properties b/gradle.properties index a31a002f2..b9a94aac6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.caching=true # Mod Info mod_name=DistantHorizons mod_version=2.0.0-a-dev -maven_group=com.seibel.lod +maven_group=com.seibel.distanthorizons mod_readable_name=Distant Horizons mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow. # Note: In forge's mods.toml this is hard coded because Architectury throws an error with setting it as a varuable