diff options
Diffstat (limited to 'forge')
| -rw-r--r-- | forge/build.gradle | 12 | ||||
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java | 8 |
2 files changed, 10 insertions, 10 deletions
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<Potion> potions = Sets.newLinkedHashSet(); for (Ingredient container : PotionBrewing.ALLOWED_CONTAINERS) { for (PotionBrewing.Mix<Potion> mix : PotionBrewing.POTION_MIXES) { - Holder.Reference<Potion> from = mix.f_43532_; + Holder.Reference<Potion> from = mix.from; Ingredient ingredient = mix.ingredient; - Holder.Reference<Potion> to = mix.f_43534_; + Holder.Reference<Potion> 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<Item> mix : PotionBrewing.CONTAINER_MIXES) { - Holder.Reference<Item> from = mix.f_43532_; + Holder.Reference<Item> from = mix.from; Ingredient ingredient = mix.ingredient; - Holder.Reference<Item> to = mix.f_43534_; + Holder.Reference<Item> 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); |