Merge remote-tracking branch 'origin/main'

# Conflicts:
#	build.gradle
#	gradle.properties
This commit is contained in:
Ell 2024-09-25 14:26:49 +02:00
commit 0d638e9e1e
4 changed files with 12 additions and 4 deletions

View file

@ -16,9 +16,10 @@ import java.util.function.Supplier;
public final class Compat { public final class Compat {
@SuppressWarnings("Convert2MethodRef") // bleh classloading compat issues
private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>builder() private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>builder()
.put("patchouli", PatchouliCompat::new) .put("patchouli", () -> new PatchouliCompat())
.put("curios", CuriosCompat::new) .put("curios", () -> new CuriosCompat())
//.put("enchantability", EnchantibilityCompat::new) //.put("enchantability", EnchantibilityCompat::new)
.build(); .build();
private static final Map<String, ICompat> MODULES = new HashMap<>(); private static final Map<String, ICompat> MODULES = new HashMap<>();

View file

@ -72,3 +72,10 @@ side = "BOTH"
# stop your mod loading on the server for example. # stop your mod loading on the server for example.
#[features.${mod_id}] #[features.${mod_id}]
#openGLVersion="[3.2,)" #openGLVersion="[3.2,)"
[[dependencies.${mod_id}]]
modId="patchouli"
type = "required"
versionRange="[${patchouli_version},)"
ordering="NONE"
side="BOTH"

View file

@ -10,7 +10,7 @@
"tag": "forge:nuggets/gold" "tag": "forge:nuggets/gold"
}, },
"G": { "G": {
"item": "minecraft:grass_block" "item": "minecraft:short_grass"
}, },
"L": { "L": {
"tag": "minecraft:leaves" "tag": "minecraft:leaves"

View file

@ -79,6 +79,6 @@
}, },
"Ixiptla": { "Ixiptla": {
"tier": 2, "tier": 2,
"color": "5500ff" "color": "93E9BE"
} }
} }