diff options
author | modmuss50 <modmuss50@gmail.com> | 2021-11-12 10:46:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-12 10:46:23 +0000 |
commit | 35afda4398c61d2c816e02a827231308e3b58bae (patch) | |
tree | 995930d5e1499516b7eb0981187b28ceda4071bb /src/test/resources | |
parent | 2994c2d4883b4740ed0e86a82c00843b65708baa (diff) | |
download | architectury-loom-35afda4398c61d2c816e02a827231308e3b58bae.tar.gz architectury-loom-35afda4398c61d2c816e02a827231308e3b58bae.tar.bz2 architectury-loom-35afda4398c61d2c816e02a827231308e3b58bae.zip |
Fix `namedElements` not extending from api (#533)
* Fix `namedElements` not extending from api
Fix artifact not waiting for remapAllJars with shared caches
* Use apiElements
* Add a better test for this.
* Also add remapped api mods to namedElements
Diffstat (limited to 'src/test/resources')
3 files changed, 15 insertions, 23 deletions
diff --git a/src/test/resources/patches/fabric_api.patch b/src/test/resources/patches/fabric_api.patch deleted file mode 100644 index cce2c1a8..00000000 --- a/src/test/resources/patches/fabric_api.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/build.gradle b/build.gradle ---- a/build.gradle (revision fc40aa9d88e9457957bdf3f8cec9698846828cd3) -+++ b/build.gradle (date 1631009569915) -@@ -257,6 +257,9 @@ - setupRepositories(repositories) - } - -+ // Required as moduleDependencies modifies the pom -+ loom.disableDeprecatedPomGeneration(publishing.publications.mavenJava) -+ - javadoc.enabled = false - } - -@@ -296,6 +299,8 @@ - setupRepositories(repositories) - } - -+loom.disableDeprecatedPomGeneration(publishing.publications.mavenJava) -+ - void setupRepositories(RepositoryHandler repositories) { - //repositories.mavenLocal() // uncomment for testing - def ENV = System.getenv() diff --git a/src/test/resources/projects/multiproject/core/build.gradle b/src/test/resources/projects/multiproject/core/build.gradle index 8a09f64b..652eb359 100644 --- a/src/test/resources/projects/multiproject/core/build.gradle +++ b/src/test/resources/projects/multiproject/core/build.gradle @@ -1 +1,6 @@ -archivesBaseName = "core"
\ No newline at end of file +archivesBaseName = "core" + +dependencies { + // An example api dep to be used by the other sub project. + modApi "TechReborn:TechReborn-1.16:3.8.4+build.236" +}
\ No newline at end of file diff --git a/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java b/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java index e5ed082e..2afebd00 100644 --- a/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java +++ b/src/test/resources/projects/multiproject/example/src/main/java/net/fabricmc/example/ExampleMod.java @@ -1,6 +1,9 @@ package net.fabricmc.example; import net.fabricmc.api.ModInitializer; +import net.minecraft.block.BlockState; +import techreborn.blocks.cable.CableShapeUtil; +import net.minecraft.util.shape.VoxelShape; public class ExampleMod implements ModInitializer { @Override @@ -10,5 +13,11 @@ public class ExampleMod implements ModInitializer { // Proceed with mild caution. System.out.println("Hello Fabric world!"); + + if (false) { + // Just here to make sure it compiles as named, not to test it runs + BlockState state = null; + VoxelShape shape = new CableShapeUtil(null).getShape(state); + } } } |