Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
id 'net.neoforged.gradle.userdev' version '7.1.20'
id 'net.neoforged.gradle.userdev' version '7.0.192'
id 'org.jetbrains.kotlin.jvm' version "${kotlin_version}"
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ neogradle.subsystems.parchment.mappingsVersion=2024.11.17
####
minecraft_version=1.21.1
use_runtime_optional_deps=true
neo_version=21.1.217
neo_version=21.1.216
kff_version=5.10.0
jei_version=19.25.1.332
emi_version=1.1.22+1.21.1
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
31 changes: 23 additions & 8 deletions raw-assets/game-icons-map.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,41 @@ transparent background, black blur 16 shadows and 64px dimensions.

## Map between Game-Icons names and Aspect names
- ignis: Small fire
- aer: Gold shell
- aqua: At sea
- terra: Mountains
- ordo: Overmind
- perditio: Shatter
- vacuos: Glass ball
- lux: Candle light
- motus: Dodging
- gelum: Snowflake 2
- vitreus: Emerald
- metallum: Metal bar
- victus: Shining heart
- aether: Fairy wand
- alkimia: Cauldron
- mortuus: Pirate grave
- potentia: Thor fist
- permutatio: Cycle
- praecantatio: Fairy wand
- auram: Sun
- alkimia: Round potion
- vitium: Tentacle strike
- tenebrae: Eclipse
- alienis: Orbital
- volatus: Feather
- herba: Three leaves
- instrumentum: Dig dug
- fabrico: Hammer and nails
- machina: Gears
- vinculum: Wolf trap
- spiritus: Spectre
- cognitio: Brain
- ornatus: Owl
- sensus: Owl
- aversio: Broad dagger
- praemunio: Breastplate
- civilis: Two shadows
- vas: Locked Chest
- hostilis: Dread Skull
- corpus: Dinosaur Bones
- ornatus: Painted Pottery
- desiderium: Grab
- exanimis: Dread skull
- bestia: Wolf
- humanus: Two shadows

- unknown: Help
2 changes: 1 addition & 1 deletion raw-assets/public/description.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
A complete rewrite & reimagination of my favorite classic magic mod, for Neoforge!Thavma means miracle in greek. This mod is all about manipulating the elements of nature, and creating powerful arcane contraptions.![a thavma user, on a platform with magical devices](https://cdn.modrinth.com/data/cached_images/1f98a12ef6fe7e555430a66580d968f0ee9ae85a.png)To get started, craft a basic wand, and right click a bookcase, to obtain the guide book: ![](https://media.forgecdn.net/attachments/description/1271073/description_1eda43c7-b5fc-42ab-9d16-d3ab41f17957.png)![](https://media.forgecdn.net/attachments/description/1271073/description_8876b566-cc23-4ca8-a6c9-00c7d3d10d2c.png)That book will allow you to research and discover magical equipment and blocks!![research book preview](https://cdn.modrinth.com/data/cached_images/f0685b6557be9868b6833aa9a349287db2632e55.png)**This mod is in alpha**, so many features are work-in-progress. I am doing my best to reach a feature complete version asap.![the infusion altar, on a platform of greatwood planks](https://cdn.modrinth.com/data/cached_images/39b4275c431548e227ee29bfdd553216099d1e86_0.webp)All code is original and open source. Most assets are original, except some that are from open art libraries online.
A complete rewrite & reimagination of my favorite classic magic mod, for Neoforge!Thavma means miracle in greek. This mod is all about manipulating the elements of nature, and creating powerful arcane contraptions. To get started, craft a basic wand, and right click a bookcase, to obtain the guide book:![image](https://media.forgecdn.net/attachments/description/1271073/description_c918c158-1a5e-4a49-8df0-6bc6a6b5ec53.png) ![image](https://media.forgecdn.net/attachments/description/1271073/description_20c7c6ce-9b1d-40e4-81f8-f6096a594951.png)That book will allow you to research and discover magical equipment and blocks!![image](https://media.forgecdn.net/attachments/description/1271073/description_5b575c0c-3140-4658-86d8-98905833e667.png)**This mod is in early alpha**, do not expect it to be playable yet. I am doing my best to reach a stable release asap.![the infusion altar, on a platform of greatwood planks](https://media.forgecdn.net/attachments/description/1271073/description_465ac439-b6c6-44b6-9b4a-05dcccfa81f2.png)All code is original and open source. Most assets are original, except some that are from open art libraries online.
Expand Down
Binary file added raw-assets/public/handle_crafting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed raw-assets/public/plating_crafting.png
Binary file not shown.
1 change: 0 additions & 1 deletion raw-assets/public/summary.txt

This file was deleted.

Binary file modified raw-assets/public/thavma.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified raw-assets/public/wand_crafting.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "thavma:block/aer_infused_deepslate"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "thavma:block/aer_infused_stone"
}
}
}
27 changes: 22 additions & 5 deletions src/generated/resources/assets/thavma/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,42 @@
{
"aspect.thavma.aer": "Aer",
"aspect.thavma.aether": "Aether",
"aspect.thavma.alienis": "Alienis",
"aspect.thavma.alkimia": "Alkimia",
"aspect.thavma.aqua": "Aqua",
"aspect.thavma.civilis": "Civilis",
"aspect.thavma.auram": "Auram",
"aspect.thavma.aversio": "Aversio",
"aspect.thavma.bestia": "Bestia",
"aspect.thavma.cognitio": "Cognitio",
"aspect.thavma.corpus": "Corpus",
"aspect.thavma.desiderium": "Desiderium",
"aspect.thavma.exanimis": "Exanimis",
"aspect.thavma.fabrico": "Fabrico",
"aspect.thavma.gelum": "Gelum",
"aspect.thavma.herba": "Herba",
"aspect.thavma.hostilis": "Hostilis",
"aspect.thavma.humanus": "Humanus",
"aspect.thavma.ignis": "Ignis",
"aspect.thavma.instrumentum": "Instrumentum",
"aspect.thavma.lux": "Lux",
"aspect.thavma.machina": "Machina",
"aspect.thavma.metallum": "Metallum",
"aspect.thavma.ornatus": "Ornatus",
"aspect.thavma.mortuus": "Mortuus",
"aspect.thavma.motus": "Motus",
"aspect.thavma.permutatio": "Permutatio",
"aspect.thavma.potentia": "Potentia",
"aspect.thavma.praecantatio": "Praecantatio",
"aspect.thavma.praemunio": "Praemunio",
"aspect.thavma.sensus": "Sensus",
"aspect.thavma.tenebrae": "Tenebrae",
"aspect.thavma.terra": "Terra",
"aspect.thavma.vas": "Vas",
"aspect.thavma.vacuos": "Vacuos",
"aspect.thavma.victus": "Victus",
"aspect.thavma.vinculum": "Vinculum",
"aspect.thavma.vitium": "Vitium",
"aspect.thavma.vitreus": "Vitreus",
"aspect.thavma.volatus": "Volatus",
"attribute.thavma.revealing": "Revealing",
"block.thavma.aer_infused_deepslate": "Aer Infused Deepslate",
"block.thavma.aer_infused_stone": "Aer Infused Stone",
"block.thavma.aether_infused_deepslate": "Aether Infused Deepslate",
"block.thavma.aether_infused_stone": "Aether Infused Stone",
"block.thavma.aqua_infused_deepslate": "Aqua Infused Deepslate",
Expand Down Expand Up @@ -71,6 +87,7 @@
"container.thavma.research_table.socketWidget.remove": "Click to remove",
"entity.thavma.angry_zombie": "Angry Zombie",
"gui.layer.thavma.arcane_lens.no_aspects": "Nothing can be learned from this",
"item.thavma.aer_shard": "Aer Shard",
"item.thavma.aether_shard": "Aether Shard",
"item.thavma.angry_zombie_spawn_egg": "Angry Zombie Spawn Egg",
"item.thavma.apprentice_boots": "[WIP]Apprentice Boots",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "thavma:block/cube_all_emissive_overlay",
"textures": {
"layer0": "minecraft:block/deepslate",
"layer1": "thavma:block/infused_stone"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "thavma:block/cube_all_emissive_overlay",
"textures": {
"layer0": "minecraft:block/stone",
"layer1": "thavma:block/infused_stone"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "thavma:block/aer_infused_deepslate"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "thavma:block/aer_infused_stone"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "thavma:item/shard"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone",
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
2 changes: 2 additions & 0 deletions src/generated/resources/data/c/tags/block/ores.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone",
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone",
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
2 changes: 2 additions & 0 deletions src/generated/resources/data/c/tags/item/ores.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone",
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone",
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"values": [
"thavma:ignis_infused_stone",
"thavma:aer_infused_stone",
"thavma:terra_infused_stone",
"thavma:aqua_infused_stone",
"thavma:aether_infused_stone",
"thavma:ignis_infused_deepslate",
"thavma:aer_infused_deepslate",
"thavma:terra_infused_deepslate",
"thavma:aqua_infused_deepslate",
"thavma:aether_infused_deepslate"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_infused_stones": {
"conditions": {
"items": [
{
"items": "#thavma:infused_stones"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "thavma:aer_shard_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_infused_stones"
]
],
"rewards": {
"recipes": [
"thavma:aer_shard_blasting"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_infused_stones": {
"conditions": {
"items": [
{
"items": "#thavma:infused_stones"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "thavma:aer_shard_smelting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_infused_stones"
]
],
"rewards": {
"recipes": [
"thavma:aer_shard_smelting"
]
}
}
Loading
Loading