支持rple

Tesseract4D · Nov 2, 2024 · c4241e1 · c4241e1
1 parent aff2311
commit c4241e1
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -4,4 +4,4 @@ plugins {
     id 'com.gtnewhorizons.gtnhconvention'
 }
 
-version = "1.4.1"
+version = "1.4.2"
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -40,6 +40,11 @@ dependencies {
     implementation "maven.modrinth:myceliumlib:1.5.10-1.7.10"
     implementation files("libs/backhand-1.5.14.jar")
     implementation "maven.modrinth:unimixins:1.7.10-0.1.19"
-    implementation "maven.modrinth:gtnhlib:0.5.18"
-    implementation "maven.modrinth:angelica:1.0.0-beta14"
+    implementation files("libs/gtnhlib-0.5.18-dev.jar")
+    implementation "maven.modrinth:falsetweaks:3.2.1"
+    implementation "maven.modrinth:fplib:1.4.3"
+    implementation "maven.modrinth:lumi1710:1.0.0"
+    implementation "maven.modrinth:chunkapi:0.5.1"
+    implementation files("libs/rple-mc1.7.10-1.0.1-beta0003-dev.jar")
+    compileOnly files("libs/angelica-1.0.0-beta16-dev.jar")
 }
diff --git a/libs/OptiFine_1.7.10_HD_U_E7_MOD.jar b/libs/OptiFine_1.7.10_HD_U_E7_MOD.jar
diff --git a/libs/angelica-1.0.0-beta16-dev.jar b/libs/angelica-1.0.0-beta16-dev.jar
diff --git a/libs/gtnhlib-0.5.18-dev.jar b/libs/gtnhlib-0.5.18-dev.jar
diff --git a/libs/rple-mc1.7.10-1.0.1-beta0003-dev.jar b/libs/rple-mc1.7.10-1.0.1-beta0003-dev.jar
diff --git a/repositories.gradle b/repositories.gradle
@@ -1,5 +1,7 @@
 // Add any additional repositories for your dependencies here.
 
 repositories {
-
+    flatDir {
+        dirs 'libs'
+    }
 }
diff --git a/src/main/java/mods/tesseract/offhandlights/FixesDynamicLights.java b/src/main/java/mods/tesseract/offhandlights/FixesDynamicLights.java
@@ -1,5 +1,6 @@
 package mods.tesseract.offhandlights;
 
+import com.falsepattern.rple.internal.client.optifine.ColorDynamicLights;
 import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
 import cpw.mods.fml.common.Loader;
 import net.minecraft.entity.Entity;
@@ -11,8 +12,6 @@
 
 import java.lang.reflect.Method;
 
-import static com.gtnewhorizons.angelica.dynamiclights.DynamicLights.getLuminanceFromItemStack;
-
 public class FixesDynamicLights {
     public static Method m;
 
@@ -41,12 +40,22 @@ public static int getLightLevel(Object a, Entity e, @ReturnedValue int l) throws
         return l;
     }
 
+    @Fix(insertOnExit = true, returnSetting = EnumReturnSetting.ALWAYS)
+    public static short getLightLevel(ColorDynamicLights a, Entity e, @ReturnedValue short l) {
+        if (e instanceof EntityPlayer p) {
+            short d = ColorDynamicLights.getLightLevel(getOffhandItem(p));
+            if (d > l)
+                return d;
+        }
+        return l;
+    }
+
     @Fix(insertOnExit = true, returnSetting = EnumReturnSetting.ALWAYS)
     public static int getLuminanceFromEntity(DynamicLights c, Entity e, @ReturnedValue int l) {
-        if (e instanceof EntityPlayer g) {
+        if (modState != 2 && e instanceof EntityPlayer g) {
             ItemStack k = getOffhandItem(g);
             if (k != null)
-                return Math.max(l, getLuminanceFromItemStack(k, e.isInWater()));
+                return Math.max(l, DynamicLights.getLuminanceFromItemStack(k, e.isInWater()));
         }
         return l;
     }

diff --git a/src/main/java/mods/tesseract/offhandlights/OffhandLights.java b/src/main/java/mods/tesseract/offhandlights/OffhandLights.java
@@ -1,5 +1,6 @@
 package mods.tesseract.offhandlights;
 
+import com.falsepattern.rple.internal.client.optifine.ColorDynamicLights;
 import cpw.mods.fml.common.Mod;
 import net.tclproject.mysteriumlib.asm.common.CustomLoadingPlugin;
 import net.tclproject.mysteriumlib.asm.common.FirstClassTransformer;