Port to 1.20.2

TunefulTurnip · TunefulTurnip · commit 15db8ea9c0ee · 2024-03-20T09:12:17.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -1,91 +1,67 @@
 plugins {
+    id 'io.github.0ffz.github-packages' version '[1,2)'
+    id 'java-library'
     id 'eclipse'
+    id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle' version '[6.0.13, 6.2)'
-    id 'io.github.0ffz.github-packages' version '[1,2)'
-    id 'org.spongepowered.mixin' version '[0.7,0.8)'
+    id 'net.neoforged.gradle.userdev' version '7.0.57'
 }
 
 version = "${minecraft_version}-${mod_version}-neoforge"
 group = 'teamrazor.aeroblender'
 
-archivesBaseName = project.mod_id
-
+base {
+    archivesName = mod_id
+}
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-minecraft {
-    mappings channel: 'official', version: '1.20.1'
-    //accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    runs {
-        client {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'aeroblender'
-
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile',"${buildDir}/createSrgToMcp/output.srg"
-
-            mods {
-                aeroblender {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'aeroblender'
-
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile',"${buildDir}/createSrgToMcp/output.srg"
-
-            mods {
-                aeroblender {
-                    source sourceSets.main
-                }
-            }
-        }
-
-
-        gameTestServer {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            property 'forge.enabledGameTestNamespaces', 'aeroblender'
+runs {
+    // applies to all the run configs below
+    configureEach {
+        // Recommended logging data for a userdev environment
+        // The markers can be added/remove as needed separated by commas.
+        // "SCAN": For mods scan.
+        // "REGISTRIES": For firing of registry events.
+        // "REGISTRYDUMP": For getting the contents of all registries.
+        systemProperty 'forge.logging.markers', 'REGISTRIES'
+
+        // Recommended logging level for the console
+        // You can set various levels here.
+        // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
+        systemProperty 'forge.logging.console.level', 'debug'
+
+        modSource project.sourceSets.main
+    }
 
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile',"${buildDir}/createSrgToMcp/output.srg"
+    client {
+        // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-            mods {
-                aeroblender {
-                    source sourceSets.main
-                }
-            }
-        }
+    server {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+        programArgument '--nogui'
+    }
 
-        data {
-            workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
-            property 'forge.logging.console.level', 'debug'
-            args '--mod', 'aeroblender', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+    // This run config launches GameTestServer and runs all registered gametests, then exits.
+    // By default, the server will crash when no gametests are provided.
+    // The gametest system is also enabled by default for other run configs under the /test command.
+    gameTestServer {
+        systemProperty 'forge.enabledGameTestNamespaces', project.mod_id
+    }
 
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile',"${buildDir}/createSrgToMcp/output.srg"
+    data {
+        // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
+        // workingDirectory project.file('run-data')
 
-            mods {
-                aeroblender {
-                    source sourceSets.main
-                }
-            }
-        }
+        // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
+        programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
     }
 }
 
-sourceSets.main.resources { srcDir 'src/generated/resources' }
+sourceSets.main.resources {
+    srcDir 'src/generated/resources'
+}
 
 repositories {
     maven githubPackage.invoke("The-Aether-Team/The-Aether")
@@ -96,52 +72,29 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-    minecraft "net.neoforged:forge:${project.minecraft_version}-${project.neoforge_version}"
-
-    implementation fg.deobf("com.github.glitchfiend:TerraBlender-forge:${project.terrablender_version}")
+    implementation "net.neoforged:neoforge:${neoforge_version}"
 
-    runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}")
-    compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api")
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
-    implementation fg.deobf("com.aetherteam.aether:aether:${project.aether_version}")
+    implementation ("com.github.glitchfiend:TerraBlender-neoforge:${project.terrablender_version}")
 
-    implementation fg.deobf("com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}")
-    implementation fg.deobf("com.aetherteam.cumulus:cumulus_menus:${project.cumulus_version}")
-}
+    implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+${project.minecraft_version}"
 
-mixin {
-    config "aeroblender.mixins.json"
-    add sourceSets.main, "aeroblender.refmap.json"
-}
+    implementation ("com.aetherteam.aether:aether:${project.aether_version}")
 
-tasks.named('jar', Jar).configure {
-    manifest {
-        attributes([
-                "Specification-Title"     : "aeroblender",
-                "Specification-Vendor"    : "razordevs",
-                "Specification-Version"   : "1", // We are version 1 of ourselves
-                "Implementation-Title"    : project.name,
-                "Implementation-Version"  : project.jar.archiveVersion,
-                "Implementation-Vendor"   : "razordevs",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
+    implementation ("com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}")
+    implementation ("com.aetherteam.cumulus:cumulus_menus:${project.cumulus_version}")
 }
 
-
-jar.finalizedBy('reobfJar')
-
-
 publishing {
     publications {
-        mavenJava(MavenPublication) {
-            artifact jar
+        register('mavenJava', MavenPublication) {
+            from components.java
         }
     }
     repositories {
         maven {
-            url "file://${project.projectDir}/mcmodsrepo"
+            url "file://${project.projectDir}/repo"
         }
     }
-}
+}
diff --git a/gradle.properties b/gradle.properties
@@ -8,12 +8,14 @@ mod_version=1.0.1
 mod_name=AeroBlender
 mod_author=razordevs
 mod_id=aeroblender
-neoforge_version=47.1.70
-minecraft_version=1.20.1
+neoforge_version=20.2.88
+minecraft_version=1.20.2
+minecraft_version_range=[1.20.2,1.21)
+loader_version_range=[1,)
 
 # Dependencies
-aether_version=1.20.1-1.0.0-neoforge
-nitrogen_version=1.20.1-1.0.1-neoforge
-cumulus_version=1.20.1-1.0.0-neoforge
-terrablender_version=1.20.1-3.0.0.169
-curios_version=5.3.2+1.20.1
+aether_version=1.20.2-1.3.0-neoforge
+nitrogen_version=1.20.2-1.0.23-neoforge
+cumulus_version=1.20.2-1.0.0-neoforge
+curios_version=6.1.0
+terrablender_version=1.20.2-3.2.0.14
diff --git a/settings.gradle b/settings.gradle
@@ -1,23 +1,11 @@
 pluginManagement {
-    resolutionStrategy {
-        eachPlugin {
-            var plugin = requested.id.toString()
-
-            // ModGradle
-            if (plugin.startsWith('org.moddingx.modgradle.')) {
-                useModule "org.moddingx:ModGradle:${requested.version}"
-            }
-        }
-    }
     repositories {
         gradlePluginPortal()
         maven { url = 'https://maven.neoforged.net/releases/' }
         maven { url = 'https://repo.spongepowered.org/maven' }
         maven { url = 'https://maven.parchmentmc.org' }
-        maven { url = 'https://maven.moddingx.org' }
     }
 }
-
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
 }
diff --git a/src/main/java/teamrazor/aeroblender/AeroBlenderConfig.java b/src/main/java/teamrazor/aeroblender/AeroBlenderConfig.java
@@ -1,35 +1,14 @@
-/**
- * Copyright (C) Glitchfiend
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
 package teamrazor.aeroblender;
 
-import net.minecraftforge.common.ForgeConfigSpec;
+import net.neoforged.neoforge.common.ModConfigSpec;
 import org.apache.commons.lang3.tuple.Pair;
-import terrablender.config.Config;
-import terrablender.config.ConfigFile;
-
-import java.nio.file.Path;
 
 public class AeroBlenderConfig {
     public static class Common {
-        public final ForgeConfigSpec.ConfigValue<Integer> aetherRegionSize;
-        public final ForgeConfigSpec.ConfigValue<Integer> vanillaAetherRegionWeight;
+        public final ModConfigSpec.ConfigValue<Integer> aetherRegionSize;
+        public final ModConfigSpec.ConfigValue<Integer> vanillaAetherRegionWeight;
 
-        public Common(ForgeConfigSpec.Builder builder) {
+        public Common(ModConfigSpec.Builder builder) {
 
             builder.push("general");
             aetherRegionSize = builder
@@ -52,11 +31,11 @@ public static void setConfig(AeroBlenderConfig config) {
             CONFIG = config;
         }
     }
-    public static final ForgeConfigSpec COMMON_SPEC;
+    public static final ModConfigSpec COMMON_SPEC;
     public static final Common COMMON;
 
     static {
-        final Pair<Common, ForgeConfigSpec> commonSpecPair = new ForgeConfigSpec.Builder().configure(Common::new);
+        final Pair<Common, ModConfigSpec> commonSpecPair = new ModConfigSpec.Builder().configure(Common::new);
         COMMON_SPEC = commonSpecPair.getRight();
         COMMON = commonSpecPair.getLeft();
     }
diff --git a/src/main/java/teamrazor/aeroblender/Aeroblender.java b/src/main/java/teamrazor/aeroblender/Aeroblender.java
@@ -1,35 +1,23 @@
 package teamrazor.aeroblender;
 
 import com.google.common.collect.ImmutableMap;
-import com.mojang.logging.LogUtils;
 import net.minecraft.world.level.levelgen.SurfaceRules;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLPaths;
-import org.slf4j.Logger;
-import teamrazor.aeroblender.aether.AetherRegionType;
-import teamrazor.aeroblender.aether.AetherRuleCategory;
-import teamrazor.aeroblender.aether.AetherSurfaceRuleData;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.ModLoadingContext;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.config.ModConfig;
+import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neoforged.neoforge.common.NeoForge;
 import teamrazor.aeroblender.mixin.SurfaceRuleManagerAccessor;
-import terrablender.api.RegionType;
 import terrablender.api.SurfaceRuleManager;
 import terrablender.worldgen.surface.NamespacedSurfaceRuleSource;
-
-import java.util.Arrays;
-
-// The value here should match an entry in the META-INF/mods.toml file
 @Mod(Aeroblender.MODID)
 public class Aeroblender
 { public static final String MODID = "aeroblender";
     public Aeroblender()
     {
         IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
-        MinecraftForge.EVENT_BUS.register(this);
+        //NeoForge.EVENT_BUS.register(this);
         ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, AeroBlenderConfig.COMMON_SPEC);
     }
 
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,6 +1,5 @@
-
 modLoader = "javafml"
-loaderVersion = "[47,)"
+loaderVersion = "[1,)"
 license="LGPL-3.0"
 issueTrackerURL = "https://github.com/RazorDevs/AeroBlender/issues"
 
@@ -16,15 +15,15 @@ AeroBlender is a library mod for adding biomes in a simple and compatible manner
 '''
 
 [[dependencies.aeroblender]]
-modId="forge"
+modId="neoforge"
 mandatory=true
-versionRange="[47.1.0,)"
+versionRange="[1,)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.aeroblender]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.20,1.21)"
+versionRange="[1.20.2,1.21)"
 ordering="NONE"
 side="BOTH"
 [[dependencies.aeroblender]]
@@ -37,6 +36,6 @@ side="BOTH"
 [[dependencies.aeroblender]]
 modId="aether"
 mandatory=true
-versionRange="[1.0.0-beta.6,)"
+versionRange="[1.20.2-1.3.0-neoforge,)"
 ordering="AFTER"
 side="BOTH"
