mirror of
https://github.com/Ellpeck/NaturesAura.git
synced 2024-11-05 04:49:10 +01:00
Merge remote-tracking branch 'origin/main'
# Conflicts: # build.gradle # gradle.properties
This commit is contained in:
commit
0d638e9e1e
4 changed files with 12 additions and 4 deletions
|
@ -16,9 +16,10 @@ import java.util.function.Supplier;
|
|||
|
||||
public final class Compat {
|
||||
|
||||
@SuppressWarnings("Convert2MethodRef") // bleh classloading compat issues
|
||||
private static final Map<String, Supplier<ICompat>> MODULE_TYPES = ImmutableMap.<String, Supplier<ICompat>>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<String, ICompat> MODULES = new HashMap<>();
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
"tag": "forge:nuggets/gold"
|
||||
},
|
||||
"G": {
|
||||
"item": "minecraft:grass_block"
|
||||
"item": "minecraft:short_grass"
|
||||
},
|
||||
"L": {
|
||||
"tag": "minecraft:leaves"
|
||||
|
|
|
@ -79,6 +79,6 @@
|
|||
},
|
||||
"Ixiptla": {
|
||||
"tier": 2,
|
||||
"color": "5500ff"
|
||||
"color": "93E9BE"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue