🔖 LambdaControls v1.4.1: Fix crash with REI.

README.md

@@ -42,4 +42,4 @@ This mod also adds controller support.
 
 ## Build
 
-Just do `./gradlew :fabric:build` and everything should build just fine!
+Just do `./gradlew :fabric:shadowRemapJar` and everything should build just fine!

core/build.gradle

@@ -8,8 +8,6 @@ archivesBaseName = project.archives_base_name + "-core"
 dependencies {
     api "org.jetbrains:annotations:17.0.0"
     api "org.aperlambda:lambdajcommon:1.8.0"
-    api "com.electronwill.night-config:core:3.5.3"
-    api "com.electronwill.night-config:toml:3.5.3"
 }
 
 java {

fabric/build.gradle

@@ -33,7 +33,9 @@ repositories {
 }
 
 configurations {
+    shadowInternal
     shadow
+    api.extendsFrom shadow
 }
 
 dependencies {
@@ -54,8 +56,9 @@ dependencies {
     modImplementation "me.shedaniel:RoughlyEnoughItems:4.5.5"
 
     api project(":core")
-    shadow project(":core")
+    shadowInternal project(":core")
-    shadow("org.aperlambda:lambdajcommon:1.8.0")  {
+    shadow("org.aperlambda:lambdajcommon:1.8.0") {
+        // Minecraft already has all that google crap.
         exclude group: 'com.google.code.gson'
         exclude group: 'com.google.guava'
     }
@@ -85,14 +88,6 @@ java {
 
 jar {
     from "../LICENSE"
-
-    from {
-        configurations.shadow.filter {
-            it.getName().contains("lambdacontrols")
-        }.collect {
-            it.isDirectory() ? it : zipTree(it)
-        }
-    }
 }
 
 task shadowJar(type: Jar) {
@@ -100,6 +95,13 @@ task shadowJar(type: Jar) {
 
     from sourceSets.main.output
 
+    from {
+        configurations.shadowInternal.filter {
+            it.getName().contains("lambdacontrols")
+        }.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    }
     from {
         configurations.shadow.collect {
             it.isDirectory() ? it : zipTree(it)

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/RecipeViewingScreenAccessor.java

@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
  * Represents an accessor to REI's RecipeViewingScreen.
  *
  * @author LambdAurora
- * @version 1.3.0
+ * @version 1.4.0
  * @since 1.2.0
  */
 @Mixin(value = RecipeViewingScreen.class, remap = false)

fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/mixin/VillagerRecipeViewingScreenAccessor.java

@@ -21,19 +21,19 @@ import java.util.List;
  * Represents an accessor to REI's VillagerRecipeViewingScreen.
  *
  * @author LambdAurora
- * @version 1.2.0
+ * @version 1.4.1
  * @since 1.2.0
  */
-@Mixin(value = VillagerRecipeViewingScreen.class, remap = false)
+@Mixin(VillagerRecipeViewingScreen.class)
 public interface VillagerRecipeViewingScreenAccessor
 {
-    @Accessor("categories")
+    @Accessor(value = "categories", remap = false)
     List<RecipeCategory<?>> getCategories();
 
-    @Accessor("selectedCategoryIndex")
+    @Accessor(value = "selectedCategoryIndex", remap = false)
     int getSelectedCategoryIndex();
 
-    @Accessor("selectedCategoryIndex")
+    @Accessor(value = "selectedCategoryIndex", remap = false)
     void setSelectedCategoryIndex(int selectedCategoryIndex);
 
     @Invoker("init")

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.9.0+build.204
 
 # Mod Properties
-	mod_version = 1.4.0
+	mod_version = 1.4.1
 	maven_group = me.lambdaurora.lambdacontrols
 	archives_base_name = lambdacontrols