summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle.kts7
-rw-r--r--gradle.properties17
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--settings.gradle.kts3
-rw-r--r--src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java4
5 files changed, 19 insertions, 14 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 465bbef..25933b5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -66,7 +66,8 @@ dependencies {
66 modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quiltedFabricApiVersion}-${minecraftVersion}") 66 modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quiltedFabricApiVersion}-${minecraftVersion}")
67 67
68 modImplementation("vazkii.patchouli:Patchouli:${patchouliVersion}") { 68 modImplementation("vazkii.patchouli:Patchouli:${patchouliVersion}") {
69 exclude(group = "net.fabricmc", module = "fabric-loader") 69 exclude(group = "net.fabricmc")
70 exclude(group = "net.fabricmc.fabric-api")
70 } 71 }
71 72
72 modCompileOnly("mcp.mobius.waila:wthit-api:quilt-${wthitVersion}") 73 modCompileOnly("mcp.mobius.waila:wthit-api:quilt-${wthitVersion}")
@@ -96,8 +97,8 @@ publishing {
96 maven { 97 maven {
97 url = uri("https://mvn.enes.lv/") 98 url = uri("https://mvn.enes.lv/")
98 credentials { 99 credentials {
99 username = (findProperty("mvnUsername") ?: System.getenv("MVN_USERNAME")).toString() 100 username = (findProperty("mvnUsername") ?: System.getenv("MVN_USERNAME") ?: "").toString()
100 password = (findProperty("mvnPassword") ?: System.getenv("MVN_PASSWORD")).toString() 101 password = (findProperty("mvnPassword") ?: System.getenv("MVN_PASSWORD") ?: "").toString()
101 } 102 }
102 } 103 }
103 } 104 }
diff --git a/gradle.properties b/gradle.properties
index 54f1bab..fa4ad90 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,19 +1,22 @@
1# Quilt's latest versions are found in https://quiltmc.org/en/usage/latest-versions
2
1org.gradle.jvmargs = -Xmx1G 3org.gradle.jvmargs = -Xmx1G
2org.gradle.parallel = true 4org.gradle.parallel = true
3 5
4groupid = lv.enes.mc 6groupid = lv.enes.mc
5modid = eris_alchemy 7modid = eris_alchemy
6modVersion = 0.2.3-SNAPSHOT 8modVersion = 0.3.0-SNAPSHOT
7 9
8loomPluginVersion = 1.4.1 10loomPluginVersion = 1.8.5
9 11
10minecraftVersion = 1.20.1 12minecraftVersion = 1.20.1
11quiltMappings = 23 13quiltMappings = 23
12loaderVersion = 0.23.0 14loaderVersion = 0.26.4
13quiltedFabricApiVersion = 7.4.0+0.90.0 15quiltedFabricApiVersion = 7.6.0+0.92.2
14 16
15chippedVersion = 3.0.1 17chippedVersion = 3.0.6
16patchouliVersion = 1.20.1-84-FABRIC 18patchouliVersion = 1.20.1-84-FABRIC
17wthitVersion = 8.5.0 19wthitVersion = 8.15.2
18 20
19jakartaAnnotationVersion = 3.0.0-M1 \ No newline at end of file 21lombokPluginVersion = 8.10.2
22jakartaAnnotationVersion = 3.0.0 \ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..9355b41 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
1distributionBase=GRADLE_USER_HOME 1distributionBase=GRADLE_USER_HOME
2distributionPath=wrapper/dists 2distributionPath=wrapper/dists
3distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip 3distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
4networkTimeout=10000 4networkTimeout=10000
5validateDistributionUrl=true 5validateDistributionUrl=true
6zipStoreBase=GRADLE_USER_HOME 6zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b7317e9..1fe13b1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,9 +21,10 @@ pluginManagement {
21 gradlePluginPortal() 21 gradlePluginPortal()
22 } 22 }
23 23
24 val lombokPluginVersion: String by settings
24 val loomPluginVersion: String by settings 25 val loomPluginVersion: String by settings
25 plugins { 26 plugins {
26 id("io.freefair.lombok") version "8.4" 27 id("io.freefair.lombok") version lombokPluginVersion
27 id("org.quiltmc.loom") version loomPluginVersion 28 id("org.quiltmc.loom") version loomPluginVersion
28 } 29 }
29} 30}
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java
index 0a6a5a0..518cf89 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java
@@ -4,7 +4,7 @@ import com.google.gson.JsonDeserializationContext;
4import com.google.gson.JsonDeserializer; 4import com.google.gson.JsonDeserializer;
5import com.google.gson.JsonElement; 5import com.google.gson.JsonElement;
6import com.google.gson.JsonParseException; 6import com.google.gson.JsonParseException;
7import earth.terrarium.chipped.common.recipe.ChippedRecipe; 7import earth.terrarium.chipped.common.recipes.ChippedRecipe;
8import jakarta.annotation.Nonnull; 8import jakarta.annotation.Nonnull;
9import lv.enes.mc.eris_alchemy.utils.ForeignUtils; 9import lv.enes.mc.eris_alchemy.utils.ForeignUtils;
10import lv.enes.mc.eris_alchemy.utils.IngredientProvider; 10import lv.enes.mc.eris_alchemy.utils.IngredientProvider;
@@ -30,7 +30,7 @@ import java.util.stream.Stream;
30 30
31public record SimplifiedRecipe(ItemStack output, List<ItemStack> remainder, List<Supplier<Ingredient>> input) { 31public record SimplifiedRecipe(ItemStack output, List<ItemStack> remainder, List<Supplier<Ingredient>> input) {
32 public static List<SimplifiedRecipe> of(Recipe<?> recipe, RegistryAccess registryAccess) { 32 public static List<SimplifiedRecipe> of(Recipe<?> recipe, RegistryAccess registryAccess) {
33 if (ForeignUtils.isClassAvailable("earth.terrarium.chipped.common.recipe.ChippedRecipe") 33 if (ForeignUtils.isClassAvailable("earth.terrarium.chipped.common.recipes.ChippedRecipe")
34 && recipe instanceof ChippedRecipe chippedRecipe) { 34 && recipe instanceof ChippedRecipe chippedRecipe) {
35 var remainder = List.<ItemStack>of(); 35 var remainder = List.<ItemStack>of();
36 return chippedRecipe.tags() 36 return chippedRecipe.tags()