rework 0.3.0

Author: TexBlock

build.gradle.kts

@@ -54,24 +54,18 @@ loom {
 	accessWidenerPath = file("src/main/resources/lambdynlights.accesswidener")
 }
 
+repositories {
+	maven { url = uri("https://maven.neoforged.net/releases/") }
+}
+
 dependencies {
 	implementation(project(":api", configuration = "namedElements"))
 	implementation(libs.yumi.commons.core)
 
-	modImplementation(libs.fabric.api)
-
 	implementation(libs.nightconfig.core)
 	implementation(libs.nightconfig.toml)
-	modImplementation(libs.spruceui)
-	include(libs.spruceui)
-	modImplementation(libs.pridelib)
-	include(libs.pridelib)
-
-	modImplementation(libs.modmenu) {
-		this.isTransitive = false
-	}
-
-	modRuntimeOnly(libs.sodium)
+	modImplementation(libs.obsidianui)
+	include(libs.obsidianui)
 
 	shadow(project(":api", configuration = "namedElements"))
 	shadow(libs.yumi.commons.core)

build_logic/build.gradle.kts

@@ -9,10 +9,10 @@ val javaVersion = 21
 
 repositories {
 	gradlePluginPortal()
-	maven {
-		name = "Fabric"
-		url = uri("https://maven.fabricmc.net/")
-	}
+	maven { url = uri("https://maven.fabricmc.net/") }
+	maven { url = uri("https://maven.architectury.dev/") }
+	maven { url = uri("https://maven.neoforged.net/releases/") }
+	maven { url = uri("https://maven.firstdark.dev/releases") }
 }
 
 dependencies {

build_logic/src/main/kotlin/lambdynamiclights.gradle.kts

@@ -3,7 +3,7 @@ import lambdynamiclights.mappings.MojangMappingsSpec
 import org.gradle.accessors.dm.LibrariesForLibs
 
 plugins {
-	id("fabric-loom")
+	id("dev.architectury.loom")
 	`java-library`
 	id("dev.yumi.gradle.licenser")
 }
@@ -20,6 +20,18 @@ loom {
 	runtimeOnlyLog4j = true
 }
 
+repositories {
+	maven {
+		url = uri("https://maven.parchmentmc.org")
+	}
+	maven {
+		url = uri("https://maven.gegy.dev")
+	}
+	maven {
+		url = uri("https://maven.neoforged.net/releases/")
+	}
+}
+
 dependencies {
 	minecraft(libs.minecraft)
 	@Suppress("UnstableApiUsage")
@@ -28,7 +40,7 @@ dependencies {
 		parchment("org.parchmentmc.data:parchment-${Constants.mcVersion()}:${libs.versions.mappings.parchment.get()}@zip")
 		mappings("dev.lambdaurora:yalmm:${Constants.mcVersion()}+build.${libs.versions.mappings.yalmm.get()}")
 	})
-	modImplementation(libs.fabric.loader)
+	"neoForge"(libs.neoforge)
 }
 
 java {
@@ -52,4 +64,7 @@ tasks.jar {
 
 license {
 	rule(rootProject.file("HEADER"))
+
+	include("src/main/java/dev/lambdaurora/lambdynlights/*.java")
+	exclude("src/main/java/org/thinkingstudio/ryoamiclights/*.java")
 }

build_logic/src/main/kotlin/lambdynamiclights/Constants.kt

@@ -3,8 +3,8 @@ package lambdynamiclights
 import org.gradle.accessors.dm.LibrariesForLibs
 
 object Constants {
-	const val GROUP = "dev.lambdaurora"
-	const val NAME = "lambdynamiclights"
+	const val GROUP = "org.thinkingstudio"
+	const val NAME = "ryoamiclights"
 	const val VERSION = "3.0.0-alpha.1"
 	const val JAVA_VERSION = 21
 

gradle.properties

@@ -1,5 +1,6 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
+loom.platform=neoforge
 
 # Mod Properties
 archives_base_name = lambdynamiclights

gradle/libs.versions.toml

@@ -1,16 +1,12 @@
 [versions]
 minecraft = "1.21"
-fabric-loader = "0.15.11"
-fabric-api = "0.100.4+1.21"
+neoforge = "21.0.167"
 mappings-yalmm = "8"
-mappings-parchment = "2024.07.07"
+mappings-parchment = "2024.07.28"
 
 # Dependencies
 yumi-commons = "1.0.0-alpha.1"
-spruceui = "5.1.0+1.21"
-pridelib = "1.2.1+1.21"
-modmenu = "11.0.1"
-sodium = "mc1.21-0.5.9"
+obsidianui = "0.2.7+mc1.21-neoforge"
 
 # Configuration
 nightconfig = "3.8.1"
@@ -22,21 +18,17 @@ mappingio = "0.6.1"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-loader" }
-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
+neoforge = { module = "net.neoforged:neoforge", version.ref = "neoforge" }
 
 # Dependencies
 yumi-commons-core = { module = "dev.yumi.commons:yumi-commons-core", version.ref = "yumi-commons" }
-spruceui = { module = "dev.lambdaurora:spruceui", version.ref = "spruceui" }
-pridelib = { module = "io.github.queerbric:pridelib", version.ref = "pridelib" }
-modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
-sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
+obsidianui = { module = "maven.modrinth:obsidianui", version.ref = "obsidianui" }
 
 # Configuration
 nightconfig-core = { module = "com.electronwill.night-config:core", version.ref = "nightconfig" }
 nightconfig-toml = { module = "com.electronwill.night-config:toml", version.ref = "nightconfig" }
 
 # Gradle
 gradle-licenser = { module = "dev.yumi:yumi-gradle-licenser", version.ref = "gradle-licenser" }
-gradle-loom = { module = "net.fabricmc:fabric-loom", version.ref = "gradle-loom" }
+gradle-loom = { module = "dev.architectury:architectury-loom", version.ref = "gradle-loom" }
 mappingio = { module = "net.fabricmc:mapping-io", version.ref = "mappingio" }

settings.gradle.kts

@@ -1,11 +1,11 @@
-rootProject.name = "lambdynamiclights"
+rootProject.name = "ryoamiclights"
 
 pluginManagement {
 	repositories {
-		maven {
-			name = "Fabric"
-			url = uri("https://maven.fabricmc.net/")
-		}
+		maven { url = uri("https://maven.fabricmc.net/") }
+		maven { url = uri("https://maven.architectury.dev/") }
+		maven { url = uri("https://maven.neoforged.net/releases/") }
+		maven { url = uri("https://maven.firstdark.dev/releases") }
 		gradlePluginPortal()
 	}
 }

src/main/java/dev/lambdaurora/lambdynlights/DynamicLightsConfig.java

@@ -13,16 +13,17 @@
 import com.electronwill.nightconfig.core.io.WritingMode;
 import dev.lambdaurora.lambdynlights.config.BooleanSettingEntry;
 import dev.lambdaurora.lambdynlights.config.SettingEntry;
-import dev.lambdaurora.spruceui.option.SpruceCyclingOption;
-import dev.lambdaurora.spruceui.option.SpruceOption;
-import net.fabricmc.loader.api.FabricLoader;
+import org.thinkingstudio.obsidianui.option.SpruceCyclingOption;
+import org.thinkingstudio.obsidianui.option.SpruceOption;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.network.chat.Text;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.thinkingstudio.ryoamiclights.ModLoader;
+
 import java.nio.file.Path;
 
 /**
@@ -42,7 +43,7 @@ public class DynamicLightsConfig {
 	private static final ExplosiveLightingMode DEFAULT_CREEPER_LIGHTING_MODE = ExplosiveLightingMode.SIMPLE;
 	private static final ExplosiveLightingMode DEFAULT_TNT_LIGHTING_MODE = ExplosiveLightingMode.OFF;
 
-	public static final Path CONFIG_FILE_PATH = FabricLoader.getInstance().getConfigDir().resolve("lambdynlights.toml");
+	public static final Path CONFIG_FILE_PATH = ModLoader.getConfigDir().resolve("lambdynlights.toml");
 	protected final FileConfig config;
 	private final LambDynLights mod;
 	private DynamicLightsMode dynamicLightsMode;

src/main/java/dev/lambdaurora/lambdynlights/DynamicLightsMode.java

@@ -9,8 +9,8 @@
 
 package dev.lambdaurora.lambdynlights;
 
-import dev.lambdaurora.spruceui.SpruceTexts;
-import dev.lambdaurora.spruceui.util.Nameable;
+import org.thinkingstudio.obsidianui.SpruceTexts;
+import org.thinkingstudio.obsidianui.util.Nameable;
 import net.minecraft.TextFormatting;
 import net.minecraft.network.chat.Text;
 import org.jetbrains.annotations.NotNull;

src/main/java/dev/lambdaurora/lambdynlights/ExplosiveLightingMode.java

@@ -9,8 +9,8 @@
 
 package dev.lambdaurora.lambdynlights;
 
-import dev.lambdaurora.spruceui.SpruceTexts;
-import dev.lambdaurora.spruceui.util.Nameable;
+import org.thinkingstudio.obsidianui.SpruceTexts;
+import org.thinkingstudio.obsidianui.util.Nameable;
 import net.minecraft.TextFormatting;
 import net.minecraft.network.chat.Text;
 import org.jetbrains.annotations.NotNull;

src/main/java/dev/lambdaurora/lambdynlights/LambDynLights.java

@@ -11,22 +11,12 @@
 
 import dev.lambdaurora.lambdynlights.accessor.WorldRendererAccessor;
 import dev.lambdaurora.lambdynlights.api.DynamicLightHandlers;
-import dev.lambdaurora.lambdynlights.api.DynamicLightsInitializer;
 import dev.lambdaurora.lambdynlights.resource.item.ItemLightSources;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.entrypoint.EntrypointContainer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.Identifier;
-import net.minecraft.resources.io.ResourceManager;
-import net.minecraft.resources.io.ResourceType;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
@@ -39,6 +29,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.thinkingstudio.ryoamiclights.ModLoader;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -52,7 +43,7 @@
  * @version 3.0.0
  * @since 1.0.0
  */
-public class LambDynLights implements ClientModInitializer {
+public class LambDynLights {
 	public static final String NAMESPACE = "lambdynlights";
 	private static final Logger LOGGER = LoggerFactory.getLogger("LambDynamicLights");
 	private static final double MAX_RADIUS = 7.75;
@@ -65,34 +56,12 @@ public class LambDynLights implements ClientModInitializer {
 	private long lastUpdate = System.currentTimeMillis();
 	private int lastUpdateCount = 0;
 
-	@Override
 	public void onInitializeClient() {
 		INSTANCE = this;
 		log(LOGGER, "Initializing LambDynamicLights...");
 
 		this.config.load();
 
-		FabricLoader.getInstance().getEntrypointContainers("dynamiclights", DynamicLightsInitializer.class)
-				.stream().map(EntrypointContainer::getEntrypoint)
-				.forEach(DynamicLightsInitializer::onInitializeDynamicLights);
-
-		ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
-			@Override
-			public Identifier getFabricId() {
-				return Identifier.of(NAMESPACE, "dynamiclights_resources");
-			}
-
-			@Override
-			public void reload(ResourceManager manager) {
-				LambDynLights.this.itemLightSources.load(manager);
-			}
-		});
-
-		WorldRenderEvents.START.register(context -> {
-			Minecraft.getInstance().getProfiler().swap("dynamic_lighting");
-			this.updateAll(context.worldRenderer());
-		});
-
 		DynamicLightHandlers.registerDefaultHandlers();
 	}
 
@@ -372,7 +341,7 @@ public void removeBlockEntitiesLightSource() {
 	 * @param msg the message to log
 	 */
 	public static void log(Logger logger, String msg) {
-		if (!FabricLoader.getInstance().isDevelopmentEnvironment()) {
+		if (!ModLoader.isDevelopmentEnvironment()) {
 			msg = "[LambDynLights] " + msg;
 		}
 
@@ -386,7 +355,7 @@ public static void log(Logger logger, String msg) {
 	 * @param msg the message to log
 	 */
 	public static void warn(Logger logger, String msg) {
-		if (!FabricLoader.getInstance().isDevelopmentEnvironment()) {
+		if (!ModLoader.isDevelopmentEnvironment()) {
 			msg = "[LambDynLights] " + msg;
 		}
 
@@ -400,7 +369,7 @@ public static void warn(Logger logger, String msg) {
 	 * @param msg the message to log
 	 */
 	public static void warn(Logger logger, String msg, Object... args) {
-		if (!FabricLoader.getInstance().isDevelopmentEnvironment()) {
+		if (!ModLoader.isDevelopmentEnvironment()) {
 			msg = "[LambDynLights] " + msg;
 		}
 

src/main/java/dev/lambdaurora/lambdynlights/LambDynLightsCompat.java

@@ -9,9 +9,8 @@
 
 package dev.lambdaurora.lambdynlights;
 
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.Version;
-import net.fabricmc.loader.api.VersionParsingException;
+import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.thinkingstudio.ryoamiclights.ModLoader;
 
 /**
  * Represents a utility class for compatibility.
@@ -27,7 +26,7 @@ public final class LambDynLightsCompat {
 	 * @return {@code true} if Canvas is installed, else {@code false}
 	 */
 	public static boolean isCanvasInstalled() {
-		return FabricLoader.getInstance().isModLoaded("canvas");
+		return ModLoader.isModLoaded("canvas");
 	}
 
 	/**
@@ -37,7 +36,7 @@ public static boolean isCanvasInstalled() {
 	 */
 	public static boolean isLilTaterReloadedInstalled() {
 		// Don't even think about it Yog.
-		return FabricLoader.getInstance().isModLoaded("ltr");
+		return ModLoader.isModLoaded("ltr");
 	}
 
 	/**
@@ -46,17 +45,13 @@ public static boolean isLilTaterReloadedInstalled() {
 	 * @return {@code true} if Sodium 0.1.0 is installed, else {@code false}
 	 */
 	public static boolean isSodium010Installed() {
-		return FabricLoader.getInstance().getModContainer("sodium").map(mod -> mod.getMetadata().getVersion().getFriendlyString().startsWith("0.1.0"))
+		return ModLoader.getModContainer("sodium").map(modContainer -> modContainer.getModInfo().getVersion().toString().startsWith("0.1.0"))
 				.orElse(false);
 	}
 
 	public static boolean isSodium05XInstalled() {
-		return FabricLoader.getInstance().getModContainer("sodium").map(mod -> {
-			try {
-				return mod.getMetadata().getVersion().compareTo(Version.parse("0.5.0")) >= 0;
-			} catch (VersionParsingException e) {
-				throw new RuntimeException(e);
-			}
+		return ModLoader.getModContainer("sodium").map(modContainer -> {
+			return modContainer.getModInfo().getVersion().compareTo(new DefaultArtifactVersion("0.5.0")) >= 0;
 		}).orElse(false);
 	}
 }