Renamed many neoforged stuff to neoforge (removed "d" at the end)

.gitlab-ci.yml

@@ -43,7 +43,7 @@ build:
       - quilt/build/libs/*.jar
       - fabric/build/libs/*.jar
       - forge/build/libs/*.jar
-      - neoforged/build/libs/*.jar
+      - neoforge/build/libs/*.jar
     exclude:
       # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller
       - fabric/build/libs/*-all.jar
@@ -52,8 +52,8 @@ build:
       - quilt/build/libs/*-sources.jar
       - forge/build/libs/*-all.jar
       - forge/build/libs/*-sources.jar
-      - neoforged/build/libs/*-all.jar
+      - neoforge/build/libs/*-all.jar
-      - neoforged/build/libs/*-sources.jar
+      - neoforge/build/libs/*-sources.jar
     expire_in: 14 days
     when: always
   extends: .build_java

build.gradle

@@ -76,10 +76,10 @@ forgix {
             jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
         }
     
-    if (findProject(":neoforged"))
+    if (findProject(":neoforge"))
         custom {
-            projectName = "neoforged"
+            projectName = "neoforge"
-            jarLocation = "build/libs/DistantHorizons-neoforged-${rootProject.versionStr}.jar"
+            jarLocation = "build/libs/DistantHorizons-neoforge-${rootProject.versionStr}.jar"
         }
 
     if (findProject(":fabric"))
@@ -113,7 +113,7 @@ subprojects { p ->
     // Apply forge's loom
     if (
             (findProject(":forge") && p == project(":forge")) ||
-            (findProject(":neoforged") && p == project(":neoforged"))
+            (findProject(":neoforge") && p == project(":neoforge"))
     )
         apply plugin: "dev.architectury.loom"
 
@@ -154,13 +154,13 @@ subprojects { p ->
             runtimeClasspath.extendsFrom common
             if (findProject(":forge"))
                 developmentForge.extendsFrom common
-            if (findProject(":neoforged"))
+            if (findProject(":neoforge"))
                 developmentNeoForge.extendsFrom common
             compileClasspath.extendsFrom coreProjects
             runtimeClasspath.extendsFrom coreProjects
             if (findProject(":forge"))
                 developmentForge.extendsFrom coreProjects
-            if (findProject(":neoforged"))
+            if (findProject(":neoforge"))
                 developmentNeoForge.extendsFrom coreProjects
 
             if (findProject(":fabricLike") && p != project(":fabricLike")) {

forge/src/main/resources/META-INF/mods.toml

@@ -27,7 +27,7 @@ issueTrackerURL = "${issues}"
 [[dependencies.distanthorizons]]
     modId = "minecraft"
     mandatory = true  # Forge syntax
-    type = "required" # Neoforged syntax
+    type = "required" # Neoforge syntax
     versionRange = "${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for
     ordering = "NONE"
     side = "BOTH"

neoforge/build.gradle

@@ -13,7 +13,7 @@ architectury {
 
 repositories {
     maven {
-        name "Neoforged"
+        name "Neoforge"
         url "https://maven.neoforged.net/releases/"
     }
 }
@@ -51,14 +51,14 @@ loom {
     runs {
         client {
             client()
-            setConfigName("Neoforged Client")
+            setConfigName("NeoForge Client")
             ideConfigGenerated(true)
             runDir("../run")
 //            vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg)
         }
         server {
             server()
-            setConfigName("Neoforged Server")
+            setConfigName("NeoForge Server")
             ideConfigGenerated(true)
             runDir("../run")
         }
@@ -92,8 +92,8 @@ dependencies {
 //        it.mappings "dev.architectury:yarn-mappings-patch-forge:${rootProject.mappings_patch}"
     }
 
-    // Neoforged
+    // Neoforge
-    neoForge "net.neoforged:neoforge:${rootProject.neoforged_version}"
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
 
     // Architectury API
 //    if (minecraft_version == "1.16.5") {

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged;
+package com.seibel.distanthorizons.neoforge;
 
 import com.seibel.distanthorizons.common.util.ProxyUtil;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged;
+package com.seibel.distanthorizons.neoforge;
 
 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.neoforged.wrappers.NeoforgeDependencySetup;
+import com.seibel.distanthorizons.neoforge.wrappers.NeoforgeDependencySetup;
 
-import com.seibel.distanthorizons.neoforged.wrappers.modAccessor.OptifineAccessor;
+import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.OptifineAccessor;
 
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.core.Direction;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.neoforged;
+package com.seibel.distanthorizons.neoforge;
 
 import com.seibel.distanthorizons.common.util.ProxyUtil;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/NeoforgeMixinPlugin.java

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.neoforged.mixins;
+package com.seibel.distanthorizons.neoforge.mixins;
 
 import net.minecraft.client.ClientBrandRetriever;
 import net.neoforged.fml.ModList;
@@ -13,7 +13,7 @@ import java.util.Set;
  * @author coolGi
  * @author cortex
  */
-public class NeoforgedMixinPlugin implements IMixinConfigPlugin
+public class NeoforgeMixinPlugin implements IMixinConfigPlugin
 {
 	
 	@Override

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinClientPacketListener.java

@@ -1,6 +1,5 @@
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import org.spongepowered.asm.mixin.Mixin;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDebugScreenOverlay.java

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import net.minecraft.client.gui.components.DebugScreenOverlay;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDynamicTexture.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 
 import com.mojang.blaze3d.platform.NativeImage;
@@ -38,8 +38,6 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import javax.annotation.Nullable;
-
 @Mixin(DynamicTexture.class)
 public abstract class MixinDynamicTexture implements ILightTextureMarker
 {

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinGameRenderer.java

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 #if MC_VER < MC_1_19_4
@@ -35,23 +35,16 @@ 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.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.world.level.lighting.LevelLightEngine;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.nio.FloatBuffer;
-
 #if MC_VER < MC_1_17_1
 import org.lwjgl.opengl.GL15;
 #endif

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 
 import com.seibel.distanthorizons.common.util.ILightTextureMarker;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
@@ -9,7 +9,6 @@ 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;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
 import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.TextureUtil;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinWorldUpgrader.java

@@ -1,36 +1,6 @@
-package com.seibel.distanthorizons.neoforged.mixins.client;
+package com.seibel.distanthorizons.neoforge.mixins.client;
 
-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;
-import net.minecraft.world.level.dimension.DimensionType;
-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 org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-import java.io.File;
-import java.nio.file.Path;
 
 #if FALSE
 @Mixin(WorldUpgrader.class)

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinChunkGenerator.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.server;
+package com.seibel.distanthorizons.neoforge.mixins.server;
 
 import org.spongepowered.asm.mixin.Mixin;
 import net.minecraft.world.level.chunk.ChunkGenerator;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinTFChunkGenerator.java

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.neoforged.mixins.server;
+package com.seibel.distanthorizons.neoforge.mixins.server;
 
 import net.minecraft.world.level.chunk.ChunkGenerator;
 import org.spongepowered.asm.mixin.Mixin;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinUtilBackgroundThread.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.server;
+package com.seibel.distanthorizons.neoforge.mixins.server;
 
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/unsafe/MixinThreadingDetector.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.mixins.server.unsafe;
+package com.seibel.distanthorizons.neoforge.mixins.server.unsafe;
 
 import org.spongepowered.asm.mixin.Mixin;
 #if MC_VER >= MC_1_18_2

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeDependencySetup.java

@@ -17,11 +17,11 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.wrappers;
+package com.seibel.distanthorizons.neoforge.wrappers;
 
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.distanthorizons.neoforged.wrappers.modAccessor.ModChecker;
+import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.ModChecker;
 
 /**
  * Binds all necessary dependencies so we

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/ModChecker.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.wrappers.modAccessor;
+package com.seibel.distanthorizons.neoforge.wrappers.modAccessor;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import net.neoforged.fml.ModList;

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/OptifineAccessor.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforged.wrappers.modAccessor;
+package com.seibel.distanthorizons.neoforge.wrappers.modAccessor;
 
 import java.util.HashSet;
 

neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json

@@ -1,7 +1,7 @@
 {
     "required": true,
     "minVersion": "0.8",
-    "package": "com.seibel.distanthorizons.neoforged.mixins",
+    "package": "com.seibel.distanthorizons.neoforge.mixins",
     "mixins": [
         "server.unsafe.MixinThreadingDetector",
         "server.MixinUtilBackgroundThread",
@@ -20,5 +20,5 @@
         "client.MixinTextureUtil"
     ],
     "server": [],
-    "plugin": "com.seibel.distanthorizons.neoforged.mixins.NeoforgedMixinPlugin"
+    "plugin": "com.seibel.distanthorizons.neoforge.mixins.NeoforgeMixinPlugin"
 }

neoforge/src/main/resources/META-INF/mods.toml

@@ -26,12 +26,12 @@ issueTrackerURL = "${issues}"
 # TODO: Once there is a way to move this to the `META-INF/MANIFEST.MF` with architectury, DO SO!
 #  (currently, this only works cus neoforge's mods.toml is added to the jar after forge's mods.toml, so this can work
 [[mixins]]
-    config = "DistantHorizons.neoforged.mixins.json"
+    config = "DistantHorizons.neoforge.mixins.json"
 
 [[dependencies.distanthorizons]]
     modId = "minecraft"
     mandatory = true  # Forge syntax
-    type = "required" # Neoforged syntax
+    type = "required" # Neoforge syntax
     versionRange = "${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for
     ordering = "NONE"
     side = "BOTH"

settings.gradle

@@ -10,7 +10,7 @@ pluginManagement {
             url "https://maven.minecraftforge.net/"
         }
         maven {
-            name "Neoforged"
+            name "NeoForge"
             url "https://maven.neoforged.net/releases/"
         }
         maven {

versionProperties/1.20.4.properties

@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 parchment_version=1.20.2:2023.12.10
 compatible_minecraft_versions=["1.20.3", "1.20.4"]
 accessWidenerVersion=1_20_2
-builds_for=fabric,forge,neoforged
+builds_for=fabric,forge,neoforge
 
 # Fabric loader
 fabric_loader_version=0.15.1
@@ -38,7 +38,7 @@ fabric_api_version=0.91.2+1.20.4
 
 # (Neo)Forge loader
 forge_version=49.0.16
-neoforged_version=20.4.83-beta
+neoforge_version=20.4.83-beta
     # (Neo)Forge mod versions
     starlight_version_forge=
     terraforged_version=