From b72b1c1ca539595d76d5854a10525ee7986dc769 Mon Sep 17 00:00:00 2001 From: echohunter221 Date: Thu, 9 May 2024 05:03:28 -0400 Subject: [PATCH 1/8] Fixed recipe gold_fiber.json (#353) Just fixed the recipe to use grass instead of a grass block, that's it. --- src/main/resources/data/naturesaura/recipes/gold_fiber.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/data/naturesaura/recipes/gold_fiber.json b/src/main/resources/data/naturesaura/recipes/gold_fiber.json index ca185a9b..71498463 100644 --- a/src/main/resources/data/naturesaura/recipes/gold_fiber.json +++ b/src/main/resources/data/naturesaura/recipes/gold_fiber.json @@ -10,7 +10,7 @@ "tag": "forge:nuggets/gold" }, "G": { - "item": "minecraft:grass_block" + "item": "minecraft:short_grass" }, "L": { "tag": "minecraft:leaves" From a11c21d5034915a108674e6ad7695551b5e3f452 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 16 May 2024 18:28:20 +0200 Subject: [PATCH 2/8] fixed curios not being optional, and made patchouli a mods.toml dep closes #354 --- build.gradle | 3 ++- gradle.properties | 2 +- src/main/java/de/ellpeck/naturesaura/compat/Compat.java | 5 +++-- src/main/resources/META-INF/mods.toml | 7 +++++++ 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 1bab577a..af2436c3 100644 --- a/build.gradle +++ b/build.gradle @@ -116,6 +116,7 @@ tasks.withType(ProcessResources).configureEach { loader_version_range: loader_version_range, mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, mod_authors : mod_authors, mod_description: mod_description, + patchouli_version : patchouli_version ] inputs.properties replaceProperties @@ -145,4 +146,4 @@ publishing { tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index a1fb0a25..9a2c0989 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ loader_version_range=[2,) jei_version=17.3.0.48 curios_version=7.2.0+1.20.4 -patchouli_version=1.20.4-85-NEOFORGE-SNAPSHOT +patchouli_version=1.20.4-85-NEOFORGE ## Mod Properties # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} diff --git a/src/main/java/de/ellpeck/naturesaura/compat/Compat.java b/src/main/java/de/ellpeck/naturesaura/compat/Compat.java index 50a87f3d..bf2769ed 100644 --- a/src/main/java/de/ellpeck/naturesaura/compat/Compat.java +++ b/src/main/java/de/ellpeck/naturesaura/compat/Compat.java @@ -16,9 +16,10 @@ import java.util.function.Supplier; public final class Compat { + @SuppressWarnings("Convert2MethodRef") // bleh classloading compat issues private static final Map> MODULE_TYPES = ImmutableMap.>builder() - .put("patchouli", PatchouliCompat::new) - .put("curios", CuriosCompat::new) + .put("patchouli", () -> new PatchouliCompat()) + .put("curios", () -> new CuriosCompat()) //.put("enchantability", EnchantibilityCompat::new) .build(); private static final Map MODULES = new HashMap<>(); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 16cf0a10..9cf96051 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -72,3 +72,10 @@ side = "BOTH" # stop your mod loading on the server for example. #[features.${mod_id}] #openGLVersion="[3.2,)" + +[[dependencies.${mod_id}]] +modId="patchouli" +type = "required" +versionRange="[${patchouli_version},)" +ordering="NONE" +side="BOTH" From 9ebc8e9054482c5161b14e5184695e773d0aeaa9 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 16 May 2024 18:32:06 +0200 Subject: [PATCH 3/8] 40.2 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9a2c0989..752a09d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,7 +32,7 @@ mod_name=NaturesAura # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT # The mod version. See https://semver.org/ -mod_version=40.1 +mod_version=40.2 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html From 0b19713fd725718a8916284ba180965c2fc45bc5 Mon Sep 17 00:00:00 2001 From: Ell Date: Wed, 5 Jun 2024 15:49:00 +0200 Subject: [PATCH 4/8] Update supporters.json --- supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supporters.json b/supporters.json index 49ee6720..8a793be7 100644 --- a/supporters.json +++ b/supporters.json @@ -79,6 +79,6 @@ }, "Ixiptla": { "tier": 2, - "color": "5500ff" + "color": "E0115F" } } From 4e67c9e41f10d5d7400b70a7efb1935f19fbfad8 Mon Sep 17 00:00:00 2001 From: Ell Date: Wed, 5 Jun 2024 19:14:08 +0200 Subject: [PATCH 5/8] Update supporters.json --- supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supporters.json b/supporters.json index 8a793be7..528376a5 100644 --- a/supporters.json +++ b/supporters.json @@ -79,6 +79,6 @@ }, "Ixiptla": { "tier": 2, - "color": "E0115F" + "color": "EE1C25" } } From 033cb6d1315f1556c5ffde0fc4b2fe0dee973c11 Mon Sep 17 00:00:00 2001 From: Ell Date: Wed, 5 Jun 2024 19:28:13 +0200 Subject: [PATCH 6/8] Update supporters.json --- supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supporters.json b/supporters.json index 528376a5..2fef2932 100644 --- a/supporters.json +++ b/supporters.json @@ -79,6 +79,6 @@ }, "Ixiptla": { "tier": 2, - "color": "EE1C25" + "color": "DC143C" } } From 95ac10bb52a28ad63da9108d0d61253245e6302f Mon Sep 17 00:00:00 2001 From: Ell Date: Wed, 5 Jun 2024 19:51:34 +0200 Subject: [PATCH 7/8] Update supporters.json pls --- supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supporters.json b/supporters.json index 2fef2932..64842857 100644 --- a/supporters.json +++ b/supporters.json @@ -79,6 +79,6 @@ }, "Ixiptla": { "tier": 2, - "color": "DC143C" + "color": "aaff9a" } } From 34c9bb63de97a3a5a9fa5b4564ee33327e52b6b9 Mon Sep 17 00:00:00 2001 From: Ell Date: Mon, 10 Jun 2024 18:51:02 +0200 Subject: [PATCH 8/8] Update supporters.json --- supporters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supporters.json b/supporters.json index 64842857..7782a949 100644 --- a/supporters.json +++ b/supporters.json @@ -79,6 +79,6 @@ }, "Ixiptla": { "tier": 2, - "color": "aaff9a" + "color": "93E9BE" } }