Merge pull request #2 from Saereth/dev

Port FTB Obsidian to Minecraft 26.1

Author: desht

build.gradle

@@ -22,15 +22,10 @@ base {
 apply from: 'https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/changelog.gradle'
 apply from: "https://raw.githubusercontent.com/FTBTeam/mods-meta/main/gradle/publishing.gradle"
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
+java.toolchain.languageVersion = JavaLanguageVersion.of(25)
 
 neoForge {
-	version = "${mcMinorAndPatch}.${neo_version}"
-
-	parchment {
-		mappingsVersion = project.parchment_mappings_version
-		minecraftVersion = project.parchment_minecraft_version.replace("\${mc_version}", minecraft_version)
-	}
+	version = "${neo_version}"
 
 	runs {
 		configureEach {
@@ -40,8 +35,6 @@ neoForge {
 
 		client {
 			client()
-
-			// Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
 			systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
 		}
 
@@ -71,10 +64,6 @@ neoForge {
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-// Sets up a dependency configuration called 'localRuntime'.
-// This configuration should be used instead of 'runtimeOnly' to declare
-// a dependency that will be present for runtime testing but that is
-// "optional", meaning it will not be pulled by dependents of this mod.
 configurations {
 	runtimeClasspath.extendsFrom localRuntime
 }
@@ -86,6 +75,12 @@ repositories {
 			includeGroup("dev.ftb.mods")
 		}
 	}
+	maven {
+		url = "https://maven.ftb.dev/snapshots"
+		content {
+			includeGroup("dev.ftb.mods")
+		}
+	}
 
 	maven {
 		url = "https://maven.architectury.dev"
@@ -104,19 +99,8 @@ tasks.register("sourcesJar", Jar) {
 	from sourceSets.main.allJava
 }
 
-// Uncomment this if you want to create an API jar
-// tasks.register("apiJar", Jar) {
-// 	archiveClassifier.set("api")
-
-// 	from sourceSets.main.output
-
-// 	include 'dev/ftb/mods/{package_name}/api/**'
-// }
-
 tasks.named("jar") {
 	dependsOn("sourcesJar")
-	// Uncomment this if you want to create an API jar
-	// dependsOn("apiJar")
 }
 
 tasks.withType(ProcessResources).configureEach {
@@ -126,8 +110,7 @@ tasks.withType(ProcessResources).configureEach {
 		mod_name: mod_name,
 		pack_format: pack_format,
 		loader_version_range: loader_version_range,
-		// 99.9% of the time we're only going to target a very vague version of neoforge so this is fine.
-		mod_loader_range: mod_loader_range.replace("\${mc_base}", mcMinorAndPatch), // Replace the version in the mod loader range
+		mod_loader_range: mod_loader_range,
 	]
 
 	inputs.properties replaceProperties
@@ -136,14 +119,13 @@ tasks.withType(ProcessResources).configureEach {
 		expand replaceProperties
 	}
 
-	// Copy in the repos license file
 	from(project.rootDir) {
 		include 'LICENSE.md'
 	}
 }
 
 tasks.withType(JavaCompile).configureEach {
-	options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+	options.encoding = 'UTF-8'
 }
 
 idea {
@@ -156,7 +138,7 @@ idea {
 def getMinorAndPatchFromMc() {
 	String mcVersion = project.minecraft_version
 	String[] split = mcVersion.split("\\.")
-	return split[1] + "." + (split[2] ?: "0")
+	return split[0] + "." + split[1] + "." + (split.length > 2 ? split[2] : "0")
 }
 
 publishMods {
@@ -168,7 +150,7 @@ publishMods {
 
 	changelog = createChangelog(project)
 	file = jar.archiveFile
-	version = project.version // Pretty sure it defaults to this
+	version = project.version
 
 	def tag = providers.environmentVariable("TAG").getOrElse("release")
 	type = tag.endsWith("-beta") ? BETA : (tag.endsWith("-alpha") ? ALPHA : STABLE)
@@ -177,7 +159,7 @@ publishMods {
 		accessToken = CFToken.orElse("missing")
 		projectId = project.curseforge_id
 		minecraftVersions.add(project.minecraft_version)
-		javaVersions.add(JavaVersion.VERSION_21)
+		javaVersions.add(JavaVersion.VERSION_25)
 
 		requires("ftb-library-forge")
 	}
@@ -188,8 +170,6 @@ publishing {
 		register('mavenJava', MavenPublication) {
 			from components.java
 			artifact sourcesJar
-			// Uncomment this if you want to create an API jar
-			// artifact apiJar
 		}
 	}
 

gradle.properties

@@ -4,27 +4,20 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 
-parchment_minecraft_version=${mc_version}
-parchment_mappings_version=2024.11.17
-
 mod_name=FTB Obsidian
 mod_id=ftbobsidian
 mod_version=0
 
-minecraft_version=1.21.1
-# https://minecraft.fandom.com/wiki/Pack_format
-pack_format=34
+minecraft_version=26.1
+pack_format=84
 
-loader_version_range=[4,)
-mod_loader_range=[${mc_base},)
-neo_version=136
+loader_version_range=[11,)
+mod_loader_range=[26.1,)
+neo_version=26.1.0.1-beta
 
-#Mod Stuff
 archives_base_name=ftb-obsidian
 maven_group=dev.ftb.mods
 
-#CurseForge
 curseforge_id=1448262
 
-#Deps
-ftb_library_version=2101.1.30
+ftb_library_version=26.1.0.3-SNAPSHOT

settings.gradle

@@ -7,7 +7,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
 }
 
 rootProject.name = "ftb-obsidian"

src/main/java/dev/ftb/mods/ftbobsidian/Obsidian.java

@@ -1,15 +1,11 @@
 package dev.ftb.mods.ftbobsidian;
 
 import dev.ftb.mods.ftblibrary.config.manager.ConfigManager;
-import dev.ftb.mods.ftbobsidian.client.ClientConfig;
-import dev.ftb.mods.ftbobsidian.client.ObsidianClient;
-import dev.ftb.mods.ftbobsidian.config.CommonConfig;
-import dev.ftb.mods.ftbobsidian.config.ServerConfig;
 import dev.ftb.mods.ftbobsidian.config.StartupConfig;
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.repository.FolderRepositorySource;
 import net.minecraft.server.packs.repository.PackSource;
@@ -18,8 +14,6 @@
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
-import net.neoforged.fml.loading.FMLEnvironment;
 
 import net.neoforged.fml.loading.FMLPaths;
 import net.neoforged.neoforge.event.AddPackFindersEvent;
@@ -38,17 +32,8 @@ public class Obsidian {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Obsidian.class);
 
-    public Obsidian(IEventBus eventBus, ModContainer container) {
-        ObsidianClient.init();
-
-        ConfigManager.getInstance().registerClientConfig(ClientConfig.CONFIG, MOD_ID);
+    public Obsidian(IEventBus eventBus, ModContainer container, Dist dist) {
         ConfigManager.getInstance().registerStartupConfig(StartupConfig.CONFIG, MOD_ID);
-        ConfigManager.getInstance().registerServerConfig(ServerConfig.CONFIG, MOD_ID, false); // Server.
-        ConfigManager.getInstance().registerServerConfig(CommonConfig.CONFIG, MOD_ID, true); // Common
-
-        if (FMLEnvironment.dist == Dist.CLIENT) {
-            eventBus.<FMLClientSetupEvent>addListener(event -> clientSetup(event, eventBus));
-        }
 
         eventBus.addListener(this::addPackFinders);
     }
@@ -61,11 +46,7 @@ public void addPackFinders(AddPackFindersEvent event) {
         }
     }
 
-    private void clientSetup(FMLClientSetupEvent event, IEventBus eventBus) {
-        ObsidianClient.setup();
-    }
-
-    public static ResourceLocation id(String path) {
-        return ResourceLocation.fromNamespaceAndPath(Obsidian.MOD_ID, path);
+    public static Identifier id(String path) {
+        return Identifier.fromNamespaceAndPath(Obsidian.MOD_ID, path);
     }
 }

src/main/java/dev/ftb/mods/ftbobsidian/client/ClientConfig.java

@@ -1,15 +1,15 @@
 package dev.ftb.mods.ftbobsidian.config;
 
-import dev.ftb.mods.ftblibrary.snbt.config.SNBTConfig;
-import dev.ftb.mods.ftblibrary.snbt.config.StringListValue;
+import dev.ftb.mods.ftblibrary.config.value.Config;
+import dev.ftb.mods.ftblibrary.config.value.StringListValue;
 import dev.ftb.mods.ftbobsidian.Obsidian;
 
 import java.util.ArrayList;
 
 public interface StartupConfig {
-    SNBTConfig CONFIG = SNBTConfig.create(Obsidian.MOD_ID + "-startup");
+    Config CONFIG = Config.create(Obsidian.MOD_ID + "-startup");
 
-    SNBTConfig PACKS = CONFIG.addGroup("packs");
+    Config PACKS = CONFIG.addGroup("packs");
 
     StringListValue FORCE_LOADED_RESOURCE_PACKS = PACKS.addStringList("force_loaded", new ArrayList<>())
             .comment("List of force loaded resource packs to use, the resource pack must exist in the resourcepacks folder for it to be automatically enabled.");

src/main/java/dev/ftb/mods/ftbobsidian/client/ObsidianClient.java

@@ -1,6 +1,5 @@
 package dev.ftb.mods.ftbobsidian.mixin;
 
-import dev.ftb.mods.ftbobsidian.client.ClientConfig;
 import dev.ftb.mods.ftbobsidian.config.StartupConfig;
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.server.packs.PackLocationInfo;
@@ -46,7 +45,6 @@ private PackSelectionConfig modifyPackSelectionConfig(PackSelectionConfig select
             return FORCE_LOADED_CONFIG;
         }
 
-        // Otherwise fall back to the default
         return selectionConfig;
     }
 }