From 2a8a1f4a6491daf210bb0bc18abee4530dc9aa8a Mon Sep 17 00:00:00 2001 From: shedaniel Date: Mon, 23 Sep 2024 15:49:10 +0800 Subject: Update Gradle --- forge/build.gradle | 12 ++++++------ .../rei/plugin/client/forge/DefaultClientPluginImpl.java | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'forge') diff --git a/forge/build.gradle b/forge/build.gradle index 33e458281..bdc5027af 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -133,13 +133,13 @@ def modRuntime(str) { shadowJar { configurations = [project.configurations.shadowCommon] - classifier "dev-shadow" + archiveClassifier = "dev-shadow" } remapJar { input.set shadowJar.archiveFile dependsOn shadowJar - classifier null + archiveClassifier = null } task renameJarForPublication(type: Zip, dependsOn: remapJar) { @@ -153,7 +153,7 @@ task renameJarForPublication(type: Zip, dependsOn: remapJar) { assemble.dependsOn renameJarForPublication jar { - classifier "dev" + archiveClassifier = "dev" } java { @@ -171,7 +171,7 @@ sourcesJar { } task serverOnlyJar(type: Jar, dependsOn: [remapJar]) { - classifier "server-only" + archiveClassifier = "server-only" from(zipTree(remapJar.archiveFile.get().asFile)) { exclude "META-INF/mods.toml", "mezz/**", "me/shedaniel/rei/forge/RoughlyEnoughItemsForge.class", "me/shedaniel/rei/forge/JEIStub.class" } @@ -197,12 +197,12 @@ publishing { ["api", "default-plugin"].forEach { projectName -> def remapSrg = tasks.create("remapSrgJarFor$projectName", net.fabricmc.loom.task.RemapJarTask) { inputFile = project(":" + projectName).tasks.jar.archiveFile - classifier "srg-remapped-$projectName" + archiveClassifier = "srg-remapped-$projectName" targetNamespace = "srg" } def remapSrgSourcesJar = tasks.create("remapSrgSourcesFor$projectName", net.fabricmc.loom.task.RemapSourcesJarTask) { inputFile = project(":" + projectName).tasks.sourcesJar.archiveFile - classifier "srg-remapped-$projectName-sources" + archiveClassifier = "srg-remapped-$projectName-sources" targetNamespace = "srg" } create(projectName + "Forge", MavenPublication.class) { publication -> diff --git a/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java b/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java index 64ce38b62..8c389d3e8 100644 --- a/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java @@ -59,9 +59,9 @@ public class DefaultClientPluginImpl extends DefaultClientPlugin { Set potions = Sets.newLinkedHashSet(); for (Ingredient container : PotionBrewing.ALLOWED_CONTAINERS) { for (PotionBrewing.Mix mix : PotionBrewing.POTION_MIXES) { - Holder.Reference from = mix.f_43532_; + Holder.Reference from = mix.from; Ingredient ingredient = mix.ingredient; - Holder.Reference to = mix.f_43534_; + Holder.Reference to = mix.to; Ingredient base = Ingredient.of(Arrays.stream(container.getItems()) .map(ItemStack::copy) .map(stack -> PotionUtils.setPotion(stack, from.get()))); @@ -76,9 +76,9 @@ public class DefaultClientPluginImpl extends DefaultClientPlugin { } for (Potion potion : potions) { for (PotionBrewing.Mix mix : PotionBrewing.CONTAINER_MIXES) { - Holder.Reference from = mix.f_43532_; + Holder.Reference from = mix.from; Ingredient ingredient = mix.ingredient; - Holder.Reference to = mix.f_43534_; + Holder.Reference to = mix.to; Ingredient base = Ingredient.of(PotionUtils.setPotion(new ItemStack(from.get()), potion)); ItemStack output = PotionUtils.setPotion(new ItemStack(to.get()), potion); clientPlugin.registerBrewingRecipe(base, ingredient, output); -- cgit From adf5fd11cb45fdcb5ffed90571d68bb406f36f19 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 24 Sep 2024 11:34:29 +0800 Subject: Fix dependencies in subproject -fabric & -forge maven publications --- forge/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'forge') diff --git a/forge/build.gradle b/forge/build.gradle index bdc5027af..63a0728be 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -215,6 +215,10 @@ publishing { builtBy remapSrgSourcesJar classifier "sources" } + + // Hack to inherit the dependencies without inheriting the artifacts + publication.setArtifacts(publication.artifacts) + from components.java } } } -- cgit From c97b1a424bcfb57347bb650457aaded33c77c2ae Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 24 Sep 2024 11:46:39 +0800 Subject: Closes #1648 --- .../java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'forge') diff --git a/forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java b/forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java index e69855315..d4db2f068 100644 --- a/forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/forge/PrimitivePlatformAdapterImpl.java @@ -23,7 +23,6 @@ package me.shedaniel.rei.forge; -import me.shedaniel.rei.RoughlyEnoughItemsState; import me.shedaniel.rei.impl.init.PrimitivePlatformAdapter; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.ModList; @@ -39,9 +38,6 @@ public class PrimitivePlatformAdapterImpl implements PrimitivePlatformAdapter { @Override public void checkMods() { - if (ModList.get().isLoaded("moreoverlays")) { - RoughlyEnoughItemsState.error("REI is not compatible with MoreOverlays, and actually contains Builtin Inventory Highlighting, other features can be installed via different mods!"); - } } @Override -- cgit