Fix crash due to Mixin plugin (#239).

LambdAurora · Oct 9, 2024 · c4984f4 · c4984f4
1 parent 8facd0f
commit c4984f4
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -191,6 +191,10 @@
   - This may be re-introduced if a valid use-case is found.
 - Switched license to [Lambda License](https://github.com/LambdAurora/LambDynamicLights/blob/bbefb8860bca2e797f8a2ba8a59d1120b6e1c7b4/LICENSE).
 
+### 3.0.1
+
+- Fixed crash due to Mixin plugin ([#239](https://github.com/LambdAurora/LambDynamicLights/issues/239)).
+
 [SpruceUI]: https://github.com/LambdAurora/SpruceUI "SpruceUI page"
 [pridelib]: https://github.com/Queerbric/pridelib "Pridelib page"
 [Sodium]: https://modrinth.com/mod/sodium "Sodium Modrinth page"

diff --git a/build_logic/src/main/kotlin/lambdynamiclights/Constants.kt b/build_logic/src/main/kotlin/lambdynamiclights/Constants.kt
@@ -5,7 +5,7 @@ import org.gradle.accessors.dm.LibrariesForLibs
 object Constants {
 	const val GROUP = "dev.lambdaurora"
 	const val NAME = "lambdynamiclights"
-	const val VERSION = "3.0.0"
+	const val VERSION = "3.0.1"
 	const val JAVA_VERSION = 21
 
 	private var minecraftVersion: String? = null

diff --git a/src/main/java/dev/lambdaurora/lambdynlights/LambDynLights.java b/src/main/java/dev/lambdaurora/lambdynlights/LambDynLights.java
@@ -49,15 +49,14 @@
  * Represents the LambDynamicLights mod.
  *
  * @author LambdAurora
- * @version 3.0.0
+ * @version 3.0.1
  * @since 1.0.0
  */
 public class LambDynLights implements ClientModInitializer {
-	public static final String NAMESPACE = "lambdynlights";
 	private static final Logger LOGGER = LoggerFactory.getLogger("LambDynamicLights");
 	private static final double MAX_RADIUS = 7.75;
 	private static final double MAX_RADIUS_SQUARED = MAX_RADIUS * MAX_RADIUS;
-	public static final EventManager<Identifier> EVENT_MANAGER = new EventManager<>(Identifier.of(NAMESPACE, "default"), Identifier::parse);
+	public static final EventManager<Identifier> EVENT_MANAGER = new EventManager<>(Identifier.of(LambDynLightsConstants.NAMESPACE, "default"), Identifier::parse);
 	private static LambDynLights INSTANCE;
 	public final DynamicLightsConfig config = new DynamicLightsConfig(this);
 	public final ItemLightSources itemLightSources = new ItemLightSources();
@@ -81,7 +80,7 @@ public void onInitializeClient() {
 		ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(new SimpleSynchronousResourceReloadListener() {
 			@Override
 			public Identifier getFabricId() {
-				return Identifier.of(NAMESPACE, "dynamiclights_resources");
+				return Identifier.of(LambDynLightsConstants.NAMESPACE, "dynamiclights_resources");
 			}
 
 			@Override
@@ -98,12 +97,6 @@ public void reload(ResourceManager manager) {
 		DynamicLightHandlers.registerDefaultHandlers();
 	}
 
-	public static boolean isDevMode() {
-		return FabricLoader.getInstance().getModContainer(NAMESPACE)
-				.map(modContainer -> modContainer.getMetadata().getVersion().getFriendlyString().endsWith("-local"))
-				.orElse(true);
-	}
-
 	/**
 	 * Updates all light sources.
 	 *

diff --git a/src/main/java/dev/lambdaurora/lambdynlights/LambDynLightsConstants.java b/src/main/java/dev/lambdaurora/lambdynlights/LambDynLightsConstants.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2024 LambdAurora <[email protected]>
+ *
+ * This file is part of LambDynamicLights.
+ *
+ * Licensed under the Lambda License. For more information,
+ * see the LICENSE file.
+ */
+
+package dev.lambdaurora.lambdynlights;
+
+import net.fabricmc.loader.api.FabricLoader;
+
+/**
+ * Contains constants about LambDynamicLights.
+ *
+ * @author LambdAurora
+ * @version 3.0.1
+ * @since 3.0.1
+ */
+public final class LambDynLightsConstants {
+	/**
+	 * The namespace of this mod, whose value is {@value}.
+	 */
+	public static final String NAMESPACE = "lambdynlights";
+
+	/**
+	 * {@return {@code true} if this mod is in development mode, or {@code false} otherwise}
+	 */
+	public static boolean isDevMode() {
+		return FabricLoader.getInstance().getModContainer(NAMESPACE)
+				.map(modContainer -> modContainer.getMetadata().getVersion().getFriendlyString().endsWith("-local"))
+				.orElse(true);
+	}
+}
diff --git a/src/main/java/dev/lambdaurora/lambdynlights/LambDynLightsMixinPlugin.java b/src/main/java/dev/lambdaurora/lambdynlights/LambDynLightsMixinPlugin.java
@@ -22,7 +22,7 @@
  * LambDynamicLights mixin plugin for conditional mixins.
  *
  * @author LambdAurora
- * @version 3.0.0
+ * @version 3.0.1
  * @since 1.0.0
  */
 public class LambDynLightsMixinPlugin implements IMixinConfigPlugin {
@@ -34,7 +34,7 @@ public LambDynLightsMixinPlugin() {
 		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.sodium.FlatLightPipelineMixin", sodium05XInstalled);
 		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.sodium.LightDataAccessMixin", sodium05XInstalled);
 
-		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.DevModeMixin", LambDynLights.isDevMode());
+		this.conditionalMixins.put("dev.lambdaurora.lambdynlights.mixin.DevModeMixin", LambDynLightsConstants.isDevMode());
 	}
 
 	@Override