diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeClientProxy.java similarity index 99% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeClientProxy.java index f03766596..449714877 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeClientProxy.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge; +package com.seibel.distanthorizons.neoforged; import com.seibel.distanthorizons.common.util.ProxyUtil; import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeMain.java similarity index 96% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeMain.java index 49219e57c..c60f364e8 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeMain.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge; +package com.seibel.distanthorizons.neoforged; import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent; import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent; @@ -33,9 +33,9 @@ import com.seibel.distanthorizons.coreapi.ModInfo; 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.distanthorizons.neoforged.wrappers.ForgeDependencySetup; -import com.seibel.distanthorizons.forge.wrappers.modAccessor.OptifineAccessor; +import com.seibel.distanthorizons.neoforged.wrappers.modAccessor.OptifineAccessor; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.core.Direction; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeServerProxy.java similarity index 98% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeServerProxy.java index a55530613..83f6d644e 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/ForgeServerProxy.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/ForgeServerProxy.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge; +package com.seibel.distanthorizons.neoforged; import com.seibel.distanthorizons.common.util.ProxyUtil; import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/ForgeMixinPlugin.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/ForgeMixinPlugin.java similarity index 96% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/ForgeMixinPlugin.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/ForgeMixinPlugin.java index 734adf4ac..d2d467754 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/ForgeMixinPlugin.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/ForgeMixinPlugin.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins; +package com.seibel.distanthorizons.neoforged.mixins; import net.neoforged.fml.ModList; import org.objectweb.asm.tree.ClassNode; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinClientPacketListener.java similarity index 93% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinClientPacketListener.java index 2726de266..07f7b65d1 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinClientPacketListener.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinClientPacketListener.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper; import com.seibel.distanthorizons.core.api.internal.ClientApi; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDebugScreenOverlay.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinDebugScreenOverlay.java similarity index 91% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDebugScreenOverlay.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinDebugScreenOverlay.java index b2ea4d17a..b9f0d1ce6 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDebugScreenOverlay.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinDebugScreenOverlay.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.core.logging.f3.F3Screen; import net.minecraft.client.gui.components.DebugScreenOverlay; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinDynamicTexture.java similarity index 97% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinDynamicTexture.java index 4efbcd350..f58783e6b 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinDynamicTexture.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.mojang.blaze3d.platform.NativeImage; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinFogRenderer.java similarity index 98% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinFogRenderer.java index db0ed1a9f..480fad3e8 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinFogRenderer.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinFogRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.core.config.Config; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinGameRenderer.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinGameRenderer.java similarity index 96% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinGameRenderer.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinGameRenderer.java index 614054ee2..56b2e4698 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinGameRenderer.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinGameRenderer.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck; import com.seibel.distanthorizons.core.api.internal.ClientApi; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinLevelRenderer.java similarity index 99% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinLevelRenderer.java index 0add4e5de..0054ab483 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinLevelRenderer.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.mojang.blaze3d.vertex.PoseStack; #if MC_VER < MC_1_19_4 diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinLightTexture.java similarity index 96% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinLightTexture.java index 9bafb8a8f..6cea85ebd 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinLightTexture.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.common.util.ILightTextureMarker; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinMinecraft.java similarity index 98% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinMinecraft.java index b8c25e6e1..4b5b174c8 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinMinecraft.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.api.enums.config.EUpdateBranch; import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinOptionsScreen.java similarity index 97% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinOptionsScreen.java index e3af8c9e8..1049d0559 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinOptionsScreen.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinOptionsScreen.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen; import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinTextureUtil.java similarity index 94% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinTextureUtil.java index a9da8632b..2502b116c 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinTextureUtil.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinTextureUtil.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.TextureUtil; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinWorldUpgrader.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinWorldUpgrader.java similarity index 98% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinWorldUpgrader.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinWorldUpgrader.java index 9e2f76cda..5b46ae32e 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinWorldUpgrader.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/client/MixinWorldUpgrader.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins.client; +package com.seibel.distanthorizons.neoforged.mixins.client; import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType; import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinChunkGenerator.java similarity index 97% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinChunkGenerator.java index 3541cf2fb..1b492c5d3 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinChunkGenerator.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinChunkGenerator.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.server; +package com.seibel.distanthorizons.neoforged.mixins.server; import org.spongepowered.asm.mixin.Mixin; import net.minecraft.world.level.chunk.ChunkGenerator; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinTFChunkGenerator.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinTFChunkGenerator.java similarity index 97% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinTFChunkGenerator.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinTFChunkGenerator.java index ab203d244..d1cdc6a5d 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinTFChunkGenerator.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinTFChunkGenerator.java @@ -1,4 +1,4 @@ -package com.seibel.distanthorizons.forge.mixins.server; +package com.seibel.distanthorizons.neoforged.mixins.server; import net.minecraft.world.level.chunk.ChunkGenerator; import org.spongepowered.asm.mixin.Mixin; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinUtilBackgroundThread.java similarity index 97% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinUtilBackgroundThread.java index dee12f792..fdb9742d8 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/MixinUtilBackgroundThread.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/MixinUtilBackgroundThread.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.server; +package com.seibel.distanthorizons.neoforged.mixins.server; import java.util.concurrent.ExecutorService; import java.util.function.Supplier; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/unsafe/MixinThreadingDetector.java similarity index 96% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/unsafe/MixinThreadingDetector.java index 2cb73c02c..1d62f4785 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/mixins/server/unsafe/MixinThreadingDetector.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.mixins.server.unsafe; +package com.seibel.distanthorizons.neoforged.mixins.server.unsafe; import org.spongepowered.asm.mixin.Mixin; #if MC_VER >= MC_1_18_2 diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/ForgeDependencySetup.java similarity index 91% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/ForgeDependencySetup.java index 5008ee6c0..b1e73a77d 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/ForgeDependencySetup.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/ForgeDependencySetup.java @@ -17,11 +17,11 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.wrappers; +package com.seibel.distanthorizons.neoforged.wrappers; import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; -import com.seibel.distanthorizons.forge.wrappers.modAccessor.ModChecker; +import com.seibel.distanthorizons.neoforged.wrappers.modAccessor.ModChecker; /** * Binds all necessary dependencies so we diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/modAccessor/ModChecker.java similarity index 94% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/modAccessor/ModChecker.java index 4e8b11d69..8dfff8710 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/ModChecker.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/modAccessor/ModChecker.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.wrappers.modAccessor; +package com.seibel.distanthorizons.neoforged.wrappers.modAccessor; import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker; import net.neoforged.fml.ModList; diff --git a/neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/modAccessor/OptifineAccessor.java similarity index 94% rename from neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java rename to neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/modAccessor/OptifineAccessor.java index 13b6688be..6e157485d 100644 --- a/neoforged/src/main/java/com/seibel/distanthorizons/forge/wrappers/modAccessor/OptifineAccessor.java +++ b/neoforged/src/main/java/com/seibel/distanthorizons/neoforged/wrappers/modAccessor/OptifineAccessor.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package com.seibel.distanthorizons.forge.wrappers.modAccessor; +package com.seibel.distanthorizons.neoforged.wrappers.modAccessor; import java.util.HashSet;