diff --git a/build.gradle b/build.gradle index 6274cb2..2b8ebee 100644 --- a/build.gradle +++ b/build.gradle @@ -693,7 +693,9 @@ configurations.all { substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") - substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.11.5') because('To allow mixing with Java 8 targets') + substitute module('org.scala-lang:scala-library:2.11.1') using module('org.scala-lang:scala-library:2.13.11') because('To allow mixing with Java 8 targets') + substitute module('org.scala-lang:scala-compiler:2.11.5') using module('org.scala-lang:scala-compiler:2.13.11') because('To allow mixing with Java 8 targets') + substitute module('org.scala-lang:scala-reflect:2.11.1') using module('org.scala-lang:scala-reflect:2.13.11') because('To allow mixing with Java 8 targets') } } diff --git a/dependencies.gradle b/dependencies.gradle index 624c487..9ca379e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,4 +34,6 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { + implementation name: "CustomNPC-Plus-1.8.6-dev" + implementation name: "geckolib-forge-1.7.10-3.0.32" } diff --git a/lib/CustomNPC-Plus-1.8.6-dev.jar b/lib/CustomNPC-Plus-1.8.6-dev.jar new file mode 100644 index 0000000..2478098 Binary files /dev/null and b/lib/CustomNPC-Plus-1.8.6-dev.jar differ diff --git a/libs/geckolib-forge-1.7.10-3.0.32.jar b/lib/geckolib-forge-1.7.10-3.0.32.jar similarity index 100% rename from libs/geckolib-forge-1.7.10-3.0.32.jar rename to lib/geckolib-forge-1.7.10-3.0.32.jar diff --git a/libs/CustomNPC-Plus-1.8.6-dev.jar b/libs/CustomNPC-Plus-1.8.6-dev.jar deleted file mode 100644 index d440279..0000000 Binary files a/libs/CustomNPC-Plus-1.8.6-dev.jar and /dev/null differ diff --git a/repositories.gradle b/repositories.gradle index c884390..0113c66 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,5 +1,7 @@ // Add any additional repositories for your dependencies here repositories { - + flatDir { + dirs 'lib' + } }