Update to Unimined 1.3.9

FabricCompatibilityLayers · Aug 31, 2024 · a1d1e09 · a1d1e09
1 parent 0ca257a
commit a1d1e09
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 13 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
 	id 'java'
-	id 'xyz.wagyourtail.unimined' version "1.2.4-SNAPSHOT"
+	id 'xyz.wagyourtail.unimined' version "1.3.9-SNAPSHOT"
 	id 'maven-publish'
 }
 
@@ -29,21 +29,27 @@ repositories {
 unimined.minecraft {
 	version project.minecraft_version
 
-	legacyFabric {
-		loader project.loader_version
-		accessWidener = file("src/main/resources/fabricated-rift.accesswidener")
-	}
-
 	mappings {
 		searge()
 		mcp(project.mcp_channel, "${project.mcp_version}-${project.minecraft_version}")
 	}
+
+	legacyFabric {
+		loader project.loader_version
+		accessWidener = file("src/main/resources/fabricated-rift.accesswidener")
+	}
 }
 
 dependencies {
 	modImplementation("maven.modrinth:mod-remapping-api:${project.mod_remapping_api}")
 	modImplementation("maven.modrinth:spasm:0.2")
-	implementation("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0")
+	implementation("com.github.thecatcore.CursedMixinExtensions:fabric:1.0.0") {
+		exclude(module: 'fabric-loader')
+	}
+	implementation("com.github.thecatcore:WFVAIO:1.1.0") {
+		exclude(module: 'fabric-loader')
+	}
+	implementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-logger-api-v1:1.0.4+common+ae4aa0d092")
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -5,13 +5,12 @@ org.gradle.jvmargs=-Xmx2G
 # More versions available at: https://grayray75.github.io/LegacyFabric-Versions/
 # Fabric Properties
 	minecraft_version = 1.13.2
-	yarn_mappings = 1.13+build.508
 	loader_version = 0.15.10
 
-mcp_channel=snapshot
-mcp_version=20190311
+	mcp_channel=snapshot
+	mcp_version=20190311
 
-mod_remapping_api = 1.22.0
+	mod_remapping_api = 1.22.1
 
 # Mod Properties
 	mod_version = 1.1.0-rift.1.0.4-77

diff --git a/src/main/java/fr/catcore/fabricatedrift/FabricatedRift.java b/src/main/java/fr/catcore/fabricatedrift/FabricatedRift.java
@@ -1,6 +1,5 @@
 package fr.catcore.fabricatedrift;
 
-import fr.catcore.modremapperapi.ClassTransformer;
 import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.MappingBuilder;
 import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.ModRemapper;
 import io.github.fabriccompatibiltylayers.modremappingapi.api.v1.RemapLibrary;
@@ -9,6 +8,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.fabricmc.loader.api.ModContainer;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 
@@ -22,11 +22,15 @@ public String[] getJarFolders() {
     @Override
     public void addRemapLibraries(List<RemapLibrary> list, EnvType envType) {
         list.add(new RemapLibrary(
-                MOD_CONTAINER.findPath("./libs/Rift-FINAL.jar").orElseThrow(RuntimeException::new),
+                MOD_CONTAINER.findPath("./libs/Rift-FINAL.jar").orElseGet(() -> getLibDevPath("Rift-FINAL.jar")),
                 "rift.jar"
         ));
     }
 
+    private Path getLibDevPath(String name) {
+        return MOD_CONTAINER.findPath("./../../../libs/" + name).orElseThrow(RuntimeException::new);
+    }
+
     @Override
     public void registerMappings(MappingBuilder mappingBuilder) {