From 0d71d673af06246f7741548fb55412ca21534a25 Mon Sep 17 00:00:00 2001 From: glowredman Date: Tue, 2 Jan 2024 20:04:31 +0100 Subject: [PATCH] Adapt to changes in NeoForge 20.4.25-beta --- gradle.properties | 10 +++++++--- .../modularmaterials/data/ResourceLoader.java | 4 ---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index cf2f677..1849651 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,12 +13,16 @@ minecraft_version=1.20.4 # as they do not follow standard versioning conventions. minecraft_version_range=[1.20.2,1.21) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=20.4.20-beta +neo_version=20.4.73-beta # The Neo version range can use any version of Neo as bounds or match the loader version range -neo_version_range=[20.4,) +neo_version_range=[20.4.25,) # The loader version range can only use the major version of Neo/FML as bounds loader_version_range=[1,) +# Parchment properties +neogradle.subsystems.parchment.minecraftVersion=1.20.3 +neogradle.subsystems.parchment.mappingsVersion=2023.12.31 + ## 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} @@ -29,7 +33,7 @@ mod_name=Modular Materials # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=LGPL-3.0 # The mod version. See https://semver.org/ -mod_version=0.14.2-beta +mod_version=0.14.3-beta # 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 diff --git a/src/main/java/glowredman/modularmaterials/data/ResourceLoader.java b/src/main/java/glowredman/modularmaterials/data/ResourceLoader.java index a155b8a..d9da6ef 100644 --- a/src/main/java/glowredman/modularmaterials/data/ResourceLoader.java +++ b/src/main/java/glowredman/modularmaterials/data/ResourceLoader.java @@ -40,8 +40,6 @@ public void loadPacks(Consumer pOnLoad) { false), // isBuiltin new Info( // info Component.empty(), // description - 26, // dataFormat - 22, // resourceFormat PackCompatibility.COMPATIBLE, // compatibility FeatureFlagSet.of(), // requestedFeatures Collections.emptyList(), // overlays @@ -60,8 +58,6 @@ public void loadPacks(Consumer pOnLoad) { false), // isBuiltin new Info( // info Component.empty(), // description - 26, // dataFormat - 22, // resourceFormat PackCompatibility.COMPATIBLE, // compatibility FeatureFlagSet.of(), // requestedFeatures Collections.emptyList(), // overlays