aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--forge/build.gradle50
-rw-r--r--forge/src/main/java/me/shedaniel/rei/plugin/client/forge/DefaultClientPluginImpl.java8
-rw-r--r--gradle.properties12
-rwxr-xr-xsettings.gradle6
4 files changed, 40 insertions, 36 deletions
diff --git a/forge/build.gradle b/forge/build.gradle
index 637be2c04..c1b77389b 100644
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -89,24 +89,24 @@ dependencies {
// modRuntime("curse.maven:mekanism-tools-268567:3206396")
// modRuntime("curse.maven:autoreglib-250363:3326041")
// modRuntime("curse.maven:ars-nouveau-401955:3619899")
- modRuntime("curse.maven:patchouli-306770:3594394")
- modRuntime("curse.maven:curios-309927:3613028")
- modRuntime("curse.maven:geckolib-388172:3627502")
- modRuntime("curse.maven:refined-storage-243076:3623324")
- modRuntime("appeng:appliedenergistics2:10.0.1")
+ // modRuntime("curse.maven:patchouli-306770:3594394")
+ // modRuntime("curse.maven:curios-309927:3613028")
+ // modRuntime("curse.maven:geckolib-388172:3627502")
+ // modRuntime("curse.maven:refined-storage-243076:3623324")
+ // modRuntime("appeng:appliedenergistics2:10.0.1")
// modRuntime("curse.maven:tcon-74072:3273213")
- modRuntime("curse.maven:mantle-74924:3634761")
- modRuntime("curse.maven:jer-240630:3575590")
- modRuntime("curse.maven:jep-417645:3550303")
- modRuntime("curse.maven:simple-storage-network-268495:3594529")
+ // modRuntime("curse.maven:mantle-74924:3634761")
+ // modRuntime("curse.maven:jer-240630:3575590")
+ // modRuntime("curse.maven:jep-417645:3550303")
+ // modRuntime("curse.maven:simple-storage-network-268495:3594529")
// modRuntime("curse.maven:create-328085:3536025")
// modRuntime("curse.maven:flywheel-486392:3535459")
// modRuntime("curse.maven:industrial-foregoing-266515:3446262")
// modRuntime("curse.maven:titanium-287342:3346366")
- modRuntime("curse.maven:extended-crafting-268387:3606681")
- modRuntime("curse.maven:cucumber-272335:3623830")
- modRuntime("curse.maven:crafttweaker-239197:3602440")
- modRuntime("curse.maven:jeitweaker-368718:3602846")
+ // modRuntime("curse.maven:extended-crafting-268387:3606681")
+ // modRuntime("curse.maven:cucumber-272335:3623830")
+ // modRuntime("curse.maven:crafttweaker-239197:3602440")
+ // modRuntime("curse.maven:jeitweaker-368718:3602846")
// modRuntime("curse.maven:eidolon-429625:3157832")
// modRuntime("curse.maven:token-enchanter-444421:3449483")
// modRuntime("curse.maven:silent-lib-242998:3400030")
@@ -123,15 +123,19 @@ dependencies {
// modRuntime("curse.maven:bookshelf-228525:3474499")
// modRuntime("curse.maven:kubejs-238086:3533307")
// modRuntime("curse.maven:rhino-416294:3525704")
- modRuntime("curse.maven:enchantment-descriptions-250419:3566741")
- modRuntime("curse.maven:natures-aura-306626:3587798")
- modRuntime("curse.maven:integrated-dynamics-236307:3631804")
- modRuntime("curse.maven:common-capabilities-247007:3614900")
- modRuntime("curse.maven:cyclops-core-236307:3614854")
- modRuntime("curse.maven:elemental-craft-395158:3593428")
- modRuntime("curse.maven:datapack-anvil-432817:3569515")
- modRuntime("curse.maven:assemblylinemachines-388282:3623609")
- modRuntime("curse.maven:mystical-agriculture-246640:3645812")
+ // modRuntime("curse.maven:enchantment-descriptions-250419:3566741")
+ // modRuntime("curse.maven:natures-aura-306626:3587798")
+ // modRuntime("curse.maven:integrated-dynamics-236307:3631804")
+ // modRuntime("curse.maven:common-capabilities-247007:3614900")
+ // modRuntime("curse.maven:cyclops-core-236307:3614854")
+ // modRuntime("curse.maven:elemental-craft-395158:3593428")
+ // modRuntime("curse.maven:datapack-anvil-432817:3569515")
+ // modRuntime("curse.maven:assemblylinemachines-388282:3623609")
+ // modRuntime("curse.maven:mystical-agriculture-246640:3645812")
+}
+
+def modRuntime(str) {
+ dependencies.modLocalRuntime(str)
}
shadowJar {
@@ -194,7 +198,7 @@ publishing {
def project = project(":" + projectName)
publication.artifact(project.fakeForgeJar) { classifier null }
def remapSourcesJarTask = project.remapSourcesJar
- publication.artifact(remapSourcesJarTask.output) {
+ publication.artifact(remapSourcesJarTask) {
builtBy remapSourcesJarTask
classifier "sources"
}
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 3c7d805d4..6d69f9068 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
@@ -57,9 +57,9 @@ public class DefaultClientPluginImpl {
Set<Potion> potions = Sets.newLinkedHashSet();
for (Ingredient container : PotionBrewing.ALLOWED_CONTAINERS) {
for (PotionBrewing.Mix<Potion> mix : PotionBrewing.POTION_MIXES) {
- IRegistryDelegate<Potion> from = mix.from;
+ IRegistryDelegate<Potion> from = mix.f_43532_;
Ingredient ingredient = mix.ingredient;
- IRegistryDelegate<Potion> to = mix.to;
+ IRegistryDelegate<Potion> to = mix.f_43534_;
Ingredient base = Ingredient.of(Arrays.stream(container.getItems())
.map(ItemStack::copy)
.map(stack -> PotionUtils.setPotion(stack, from.get())));
@@ -74,9 +74,9 @@ public class DefaultClientPluginImpl {
}
for (Potion potion : potions) {
for (PotionBrewing.Mix<Item> mix : PotionBrewing.CONTAINER_MIXES) {
- IRegistryDelegate<Item> from = mix.from;
+ IRegistryDelegate<Item> from = mix.f_43532_;
Ingredient ingredient = mix.ingredient;
- IRegistryDelegate<Item> to = mix.to;
+ IRegistryDelegate<Item> to = mix.f_43534_;
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);
diff --git a/gradle.properties b/gradle.properties
index 971631d8b..8c1d217d9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
org.gradle.jvmargs=-Xmx3G
base_version=8.0
unstable=false
-supported_version=1.18.2-rc1
-minecraft_version=1.18.2-rc1
-forgeEnabled=false
-forge_version=39.0.76
-fabricloader_version=0.13.2
+supported_version=1.18.2
+minecraft_version=1.18.2
+forgeEnabled=true
+forge_version=40.0.1
+fabricloader_version=0.13.3
cloth_config_version=6.2.57
modmenu_version=3.0.0
fabric_api=0.47.8+1.18.2
-architectury_version=4.0.25
+architectury_version=4.0.27
api_exculde=
#api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric
diff --git a/settings.gradle b/settings.gradle
index d74265742..be97e596c 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,7 +13,7 @@ include "api"
include "default-plugin"
include "runtime"
include "fabric"
-//include "forge"
+include "forge"
-//include "jei-compatibility-layer"
-//include "jei-internals-workaround"
+include "jei-compatibility-layer"
+include "jei-internals-workaround"
generated by cgit (git 2.34.1) at 2026-06-21 21:17:10 +0000