port

build.gradle

@@ -26,6 +26,10 @@ repositories {
     maven {
         url = "https://www.cursemaven.com"
     }
+    maven {
+        name = "AperLambda"
+        url = 'https://aperlambda.github.io/maven'
+    }
     mavenCentral()
 }
 
@@ -126,7 +130,9 @@ dependencies {
 
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
+    compileOnly fg.deobf("curse.maven:magnesium-532724:3503910")
     runtimeOnly fg.deobf("curse.maven:magnesium-532724:3503910")
+
     runtimeOnly fg.deobf("curse.maven:jei-238222:3438494")
     runtimeOnly fg.deobf("curse.maven:jer-240630:3066754")
     runtimeOnly fg.deobf("curse.maven:jade-324717:3467445")

oldsrc/main/resources/lambdynlights.mixins.json

@@ -1,5 +1,6 @@
 {
   "required": true,
+  "minVersion": "0.8",
   "package": "me.lambdaurora.lambdynlights.mixin",
   "plugin": "me.lambdaurora.lambdynlights.LambDynLightsMixinPlugin",
   "compatibilityLevel": "JAVA_8",

settings.gradle

@@ -9,4 +9,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = 'lambdynamiclights'
+rootProject.name = 'dynamiclightsreforged'

src/main/java/me/lambdaurora/lambdynlights/DynLightsResourceListener.java

@@ -0,0 +1,22 @@
+package me.lambdaurora.lambdynlights;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import me.lambdaurora.lambdynlights.api.item.ItemLightSources;
+import net.minecraft.resources.IResourceManager;
+import net.minecraftforge.resource.IResourceType;
+import net.minecraftforge.resource.ISelectiveResourceReloadListener;
+
+import java.util.function.Predicate;
+
+public class DynLightsResourceListener implements ISelectiveResourceReloadListener
+{
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().serializeNulls().setLenient().create();
+
+    @Override
+    public void onResourceManagerReload(IResourceManager manager, Predicate<IResourceType> resourcePredicate)
+    {
+        ItemLightSources.load(manager);
+    }
+}
+

src/me/lambdaurora/lambdynlights/DynamicLightSource.java → src/main/java/me/lambdaurora/lambdynlights/DynamicLightSource.java

@@ -9,8 +9,9 @@
 
 package me.lambdaurora.lambdynlights;
 
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.world.level.Level;
+import me.lambdaurora.lambdynlights.config.DynamicLightsConfig;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.world.World;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
@@ -48,15 +49,16 @@ public interface DynamicLightSource {
      *
      * @return the world instance
      */
-    Level getDynamicLightWorld();
+    World getDynamicLightWorld();
 
     /**
      * Returns whether the dynamic light is enabled or not.
      *
      * @return {@code true} if the dynamic light is enabled, else {@code false}
      */
-    default boolean isDynamicLightEnabled() {
-        return LambDynLights.get().config.getDynamicLightsMode().isEnabled() && LambDynLights.get().containsLightSource(this);
+    default boolean isDynamicLightEnabled()
+    {
+        return DynamicLightsReforged.isEnabled() && DynamicLightsReforged.containsLightSource(this);
     }
 
     /**
@@ -70,9 +72,9 @@ default boolean isDynamicLightEnabled() {
     default void setDynamicLightEnabled(boolean enabled) {
         this.resetDynamicLight();
         if (enabled)
-            LambDynLights.get().addLightSource(this);
+            DynamicLightsReforged.addLightSource(this);
         else
-            LambDynLights.get().removeLightSource(this);
+            DynamicLightsReforged.removeLightSource(this);
     }
 
     void resetDynamicLight();
@@ -97,7 +99,7 @@ default void setDynamicLightEnabled(boolean enabled) {
      */
     boolean shouldUpdateDynamicLight();
 
-    boolean lambdynlights_updateDynamicLight(@NotNull LevelRenderer renderer);
+    boolean lambdynlights_updateDynamicLight(@NotNull WorldRenderer renderer);
 
-    void lambdynlights_scheduleTrackedChunksRebuild(@NotNull LevelRenderer renderer);
+    void lambdynlights_scheduleTrackedChunksRebuild(@NotNull WorldRenderer renderer);
 }