Compare commits

...

6 commits

Author SHA1 Message Date
Ell
fcd12352fc 41.0 2024-09-26 17:19:11 +02:00
Ell
7576d36820 finish up todos 2024-09-26 17:16:16 +02:00
Ell
ea6ab5aa78 fixed trinkets layer 2024-09-26 17:05:23 +02:00
Ell
226eefc90e reinstate curios compat 2024-09-26 16:59:35 +02:00
Ell
c5e8935595 made everything run properly 2024-09-26 16:01:30 +02:00
Ell
32baa1194b IT COMPILES!! 2024-09-26 14:38:19 +02:00
416 changed files with 1029 additions and 874 deletions

View file

@ -27,6 +27,9 @@ repositories {
maven { maven {
url = "https://maven.theillusivec4.top/" url = "https://maven.theillusivec4.top/"
} }
maven {
url = uri("https://maven.octo-studios.com/releases")
}
} }
base { base {
@ -98,8 +101,7 @@ dependencies {
compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}" compileOnly "mezz.jei:jei-${minecraft_version}-neoforge-api:${jei_version}"
runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}" runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
// runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}" implementation "top.theillusivec4.curios:curios-neoforge:${curios_version}"
// compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api" compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}:api"
runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}" runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}"
@ -125,6 +127,7 @@ tasks.withType(ProcessResources).configureEach {
loader_version_range: loader_version_range, loader_version_range: loader_version_range,
mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
mod_authors : mod_authors, mod_description: mod_description, mod_authors : mod_authors, mod_description: mod_description,
patchouli_version : patchouli_version
] ]
inputs.properties replaceProperties inputs.properties replaceProperties

View file

@ -19,8 +19,7 @@ neo_version_range=[21.1.0,)
loader_version_range=[4,) loader_version_range=[4,)
jei_version=19.18.3.204 jei_version=19.18.3.204
# TODO what to do about curios being discontinued? try out https://www.curseforge.com/minecraft/mc-mods/adorned? curios_version=9.0.11+1.21
# curios_version=7.2.0+1.20.4
patchouli_version=1.21-87-NEOFORGE patchouli_version=1.21-87-NEOFORGE
## Mod Properties ## Mod Properties
@ -32,7 +31,7 @@ mod_name=NaturesAura
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT mod_license=MIT
# The mod version. See https://semver.org/ # The mod version. See https://semver.org/
mod_version=40.1 mod_version=41.0
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # 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. # This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

View file

@ -0,0 +1,11 @@
{
"entities": [
"minecraft:player"
],
"slots": [
"charm",
"belt",
"ring",
"necklace"
]
}

View file

@ -1 +1,4 @@
{} {
"add_cosmetic": true,
"size": 1
}

View file

@ -1 +1,4 @@
{} {
"add_cosmetic": true,
"size": 1
}

View file

@ -1 +1,4 @@
{} {
"add_cosmetic": true,
"size": 1
}

View file

@ -1 +1,4 @@
{} {
"add_cosmetic": true,
"size": 1
}

View file

@ -7,9 +7,10 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"enchantments": [ "predicates": {
"minecraft:enchantments": [
{ {
"enchantment": "minecraft:silk_touch", "enchantments": "minecraft:silk_touch",
"levels": { "levels": {
"min": 1 "min": 1
} }
@ -17,6 +18,7 @@
] ]
} }
} }
}
], ],
"entries": [ "entries": [
{ {

View file

@ -7,9 +7,10 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"enchantments": [ "predicates": {
"minecraft:enchantments": [
{ {
"enchantment": "minecraft:silk_touch", "enchantments": "minecraft:silk_touch",
"levels": { "levels": {
"min": 1 "min": 1
} }
@ -17,6 +18,7 @@
] ]
} }
} }
}
], ],
"entries": [ "entries": [
{ {

View file

@ -13,9 +13,10 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"enchantments": [ "predicates": {
"minecraft:enchantments": [
{ {
"enchantment": "minecraft:silk_touch", "enchantments": "minecraft:silk_touch",
"levels": { "levels": {
"min": 1 "min": 1
} }
@ -23,6 +24,7 @@
] ]
} }
} }
}
], ],
"name": "naturesaura:nether_grass" "name": "naturesaura:nether_grass"
}, },

View file

@ -13,9 +13,10 @@
{ {
"condition": "minecraft:match_tool", "condition": "minecraft:match_tool",
"predicate": { "predicate": {
"enchantments": [ "predicates": {
"minecraft:enchantments": [
{ {
"enchantment": "minecraft:silk_touch", "enchantments": "minecraft:silk_touch",
"levels": { "levels": {
"min": 1 "min": 1
} }
@ -23,6 +24,7 @@
] ]
} }
} }
}
], ],
"name": "naturesaura:nether_wart_mushroom" "name": "naturesaura:nether_wart_mushroom"
}, },

Some files were not shown because too many files have changed in this diff Show more