diff --git a/apron/build.gradle b/apron/build.gradle index 7b3f456..bcd10c7 100644 --- a/apron/build.gradle +++ b/apron/build.gradle @@ -6,6 +6,7 @@ loom { dependencies { modApi("maven.modrinth:mod-remapping-api:${rootProject.mod_remapping_api_version}") +// modApi(files("mod-remapping-api-1.16.5.jar")) include implementation('org.slick2d:slick2d-core:1.0.2') include compileOnly(group: "de.matthiasmann", name: "twl", version: "unknown") include compileOnly(group: "org.xmlpull", name: "xml-pull", version: "unknown") diff --git a/apron/src/main/java/io/github/betterthanupdates/apron/ApronModRemapper.java b/apron/src/main/java/io/github/betterthanupdates/apron/ApronModRemapper.java index 5759105..923c233 100644 --- a/apron/src/main/java/io/github/betterthanupdates/apron/ApronModRemapper.java +++ b/apron/src/main/java/io/github/betterthanupdates/apron/ApronModRemapper.java @@ -29,7 +29,11 @@ public String[] getJarFolders() { } private Path getLibPath(String name) { - return MOD_CONTAINER.findPath("./libs/" + name + ".zip").orElseThrow(RuntimeException::new); + return MOD_CONTAINER.findPath("./libs/" + name + ".zip").orElse(getLibDevPath(name)); + } + + private Path getLibDevPath(String name) { + return MOD_CONTAINER.findPath("./../../../original/" + getEnvironment().name().toLowerCase() + "/" + name + ".zip").orElseThrow(RuntimeException::new); } @Override diff --git a/build.gradle b/build.gradle index 3ef1189..e150f56 100644 --- a/build.gradle +++ b/build.gradle @@ -178,6 +178,25 @@ dependencies { api project(path: "${it.path}", configuration: "namedElements") } } + +// implementation "org.slf4j:slf4j-api:1.8.0-beta4" +// implementation 'org.apache.logging.log4j:log4j-slf4j18-impl:2.17.2' +// +// modRuntimeOnly "net.modificationstation:StationAPI:${project.stapi_version}" +// +// // Optional, but convenient mods for mod creators and users alike. +// modRuntimeOnly("com.github.calmilamsy:ModMenu:${project.modmenu_version}") { +// transitive false +// } +// modRuntimeOnly("net.glasslauncher.mods:GlassConfigAPI:${project.gcapi_version}") { +// transitive false +// } +// modRuntimeOnly("net.glasslauncher:HowManyItems-Fabric-Unofficial:${project.howmanyitems_version}") { +// transitive false +// } +// modRuntimeOnly ("com.github.paulevsGitch:BHCreative:${project.bhcreative_version}") { +// transitive false +// } } jar { diff --git a/gradle.properties b/gradle.properties index 6c18b95..4ebf006 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ minecraft_version=b1.7.3 mappings=4 loader_version=0.14.19-babric.1 lfapi_version=1.0.4+common+ae4aa0d092 -mod_remapping_api_version=1.16.0 +mod_remapping_api_version=1.17.0 mixin_extras_version=0.2.0 stapi_version=2614e89