From ce1258228c46bc106c3f1d589b8133d1da81da2a Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Sun, 1 Dec 2024 15:02:21 +0530 Subject: [PATCH] minor fixes --- CHANGELOG | 3 +- .../assets/terraoriginum/lang/en_us.json | 40 +++++++++---------- .../data/terraoriginum/origins/monarch.json | 22 +++++----- .../powers/blight-powers/blighted_feet.json | 4 ++ .../hydropetrification.json | 0 .../hyperefficient_blood.json | 0 .../instant_transmission.json | 0 .../lackofsundamage.json | 0 .../nuclear_rush.json | 0 .../nyctophobia.json | 0 .../shining.json | 0 .../solar_energy.json | 0 .../sun_fueled.json | 0 .../super_dash.json | 0 .../totem_fueled.json | 0 15 files changed, 37 insertions(+), 32 deletions(-) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/hydropetrification.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/hyperefficient_blood.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/instant_transmission.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/lackofsundamage.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/nuclear_rush.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/nyctophobia.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/shining.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/solar_energy.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/sun_fueled.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/super_dash.json (100%) rename src/main/resources/data/terraoriginum/powers/{monarchpowers => monarch-powers}/totem_fueled.json (100%) diff --git a/CHANGELOG b/CHANGELOG index 5217602..08fadf9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,3 @@ # Changes -- Functional implementation of the 'Blight' origin. \ No newline at end of file +- changed namespace of 'monarchpowers' directory to 'monarch-powers' to fit convention. +- added 'farmland' to list of blocks that the Blight will turn to coarse dirt upon stepping on it. \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index e456cb2..f0611b9 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -226,26 +226,26 @@ //-----Monarch-----// "origin.terraoriginum.monarch.name": "Monarch", "origin.terraoriginum.monarch.description": "The Monarchs were the first of them all, they took pride in the fact that they were superior to all others of their time, that was until newer and better species came along and drove them to near extinction. \nNow they have returned after evolving into something far more powerful", - "power.terraoriginum.monarchpowers/hyperefficient_blood.name": "Hyperefficient Blood", - "power.terraoriginum.monarchpowers/hyperefficient_blood.description": "Your blood is extremely efficient, destroying any poisons within your bloodstream before they have a chance to do any damage", - "power.terraoriginum.monarchpowers/solar_energy.name": "Solar Energy", - "power.terraoriginum.monarchpowers/solar_energy.description": "You draw energy from the sun and store it within your body, and access it at will to use various abilities. But if you run out, your body will no longer be able to keep itself together", - "power.terraoriginum.monarchpowers/sun_fueled.name": "Sun Fueled", - "power.terraoriginum.monarchpowers/sun_fueled.description": "You have evolved to draw power from the sun, leading you to become more powerful during the day", - "power.terraoriginum.monarchpowers/nuclear_rush.name": "Nuclear Rush", - "power.terraoriginum.monarchpowers/nuclear_rush.description": "using the sun energy stored within your body, you can temporarily start a weak thermonuclear reaction, pushing your body beyond the limitations of living flesh.", - "power.terraoriginum.monarchpowers/instant_transmission.name": "Instant Transmission", - "power.terraoriginum.monarchpowers/instant_transmission.description": "Use the thermonuclear energy stored in your body to erase the space between you and your target", - "power.terraoriginum.monarchpowers/nyctophobia.name": "Nyctophobia", - "power.terraoriginum.monarchpowers/nyctophobia.description": "Your power is derived from the sun, making you weaker during the night", - "power.terraoriginum.monarchpowers/shining.name": "Shining", - "power.terraoriginum.monarchpowers/shining.description": "An entire lifetime of absorbing the sun's energy makes you radiate it's light", - "power.terraoriginum.monarchpowers/super_dash.name": "Super Dash", - "power.terraoriginum.monarchpowers/super_dash.description": "release a large portion of the solar energy stored within your body to create a large amount of thrust in whatever direction you are facing", - "power.terraoriginum.monarchpowers/hydropetrification.name": "Hydropetrification", - "power.terraoriginum.monarchpowers/hydropetrification.description": "Your body's cells contain a high concentration of neutrinos to facilitate nuclear processes whithin itself, this causes your entire body to heavily slow down underwater", - "power.terraoriginum.monarchpowers/totem_fueled.name": "Totem Fueled", - "power.terraoriginum.monarchpowers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun", + "power.terraoriginum.monarch-powers/hyperefficient_blood.name": "Hyperefficient Blood", + "power.terraoriginum.monarch-powers/hyperefficient_blood.description": "Your blood is extremely efficient, destroying any poisons within your bloodstream before they have a chance to do any damage", + "power.terraoriginum.monarch-powers/solar_energy.name": "Solar Energy", + "power.terraoriginum.monarch-powers/solar_energy.description": "You draw energy from the sun and store it within your body, and access it at will to use various abilities. But if you run out, your body will no longer be able to keep itself together", + "power.terraoriginum.monarch-powers/sun_fueled.name": "Sun Fueled", + "power.terraoriginum.monarch-powers/sun_fueled.description": "You have evolved to draw power from the sun, leading you to become more powerful during the day", + "power.terraoriginum.monarch-powers/nuclear_rush.name": "Nuclear Rush", + "power.terraoriginum.monarch-powers/nuclear_rush.description": "using the sun energy stored within your body, you can temporarily start a weak thermonuclear reaction, pushing your body beyond the limitations of living flesh.", + "power.terraoriginum.monarch-powers/instant_transmission.name": "Instant Transmission", + "power.terraoriginum.monarch-powers/instant_transmission.description": "Use the thermonuclear energy stored in your body to erase the space between you and your target", + "power.terraoriginum.monarch-powers/nyctophobia.name": "Nyctophobia", + "power.terraoriginum.monarch-powers/nyctophobia.description": "Your power is derived from the sun, making you weaker during the night", + "power.terraoriginum.monarch-powers/shining.name": "Shining", + "power.terraoriginum.monarch-powers/shining.description": "An entire lifetime of absorbing the sun's energy makes you radiate it's light", + "power.terraoriginum.monarch-powers/super_dash.name": "Super Dash", + "power.terraoriginum.monarch-powers/super_dash.description": "release a large portion of the solar energy stored within your body to create a large amount of thrust in whatever direction you are facing", + "power.terraoriginum.monarch-powers/hydropetrification.name": "Hydropetrification", + "power.terraoriginum.monarch-powers/hydropetrification.description": "Your body's cells contain a high concentration of neutrinos to facilitate nuclear processes whithin itself, this causes your entire body to heavily slow down underwater", + "power.terraoriginum.monarch-powers/totem_fueled.name": "Totem Fueled", + "power.terraoriginum.monarch-powers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun", //-----Blight-----// "origin.terraoriginum.blight.name": "Blight", diff --git a/src/main/resources/data/terraoriginum/origins/monarch.json b/src/main/resources/data/terraoriginum/origins/monarch.json index 2cad63f..8f3d63c 100644 --- a/src/main/resources/data/terraoriginum/origins/monarch.json +++ b/src/main/resources/data/terraoriginum/origins/monarch.json @@ -1,16 +1,16 @@ { "powers": [ - "terraoriginum:monarchpowers/solar_energy", - "terraoriginum:monarchpowers/nuclear_rush", - "terraoriginum:monarchpowers/instant_transmission", - "terraoriginum:monarchpowers/super_dash", - "terraoriginum:monarchpowers/hyperefficient_blood", - "terraoriginum:monarchpowers/hydropetrification", - "terraoriginum:monarchpowers/sun_fueled", - "terraoriginum:monarchpowers/totem_fueled", - "terraoriginum:monarchpowers/nyctophobia", - "terraoriginum:monarchpowers/shining", - "terraoriginum:monarchpowers/lackofsundamage" + "terraoriginum:monarch-powers/solar_energy", + "terraoriginum:monarch-powers/nuclear_rush", + "terraoriginum:monarch-powers/instant_transmission", + "terraoriginum:monarch-powers/super_dash", + "terraoriginum:monarch-powers/hyperefficient_blood", + "terraoriginum:monarch-powers/hydropetrification", + "terraoriginum:monarch-powers/sun_fueled", + "terraoriginum:monarch-powers/totem_fueled", + "terraoriginum:monarch-powers/nyctophobia", + "terraoriginum:monarch-powers/shining", + "terraoriginum:monarch-powers/lackofsundamage" ], "icon": "fire_charge", "order": 999, diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json b/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json index 70f15f1..a6e9aaf 100644 --- a/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json @@ -25,6 +25,10 @@ { "type": "origins:block", "block": "minecraft:mycelium" + }, + { + "type": "origins:block", + "block": "minecraft:farmland" } ] } diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/hydropetrification.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/hydropetrification.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/hyperefficient_blood.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/hyperefficient_blood.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/hyperefficient_blood.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/hyperefficient_blood.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/instant_transmission.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/instant_transmission.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/instant_transmission.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/lackofsundamage.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/lackofsundamage.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/lackofsundamage.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/nuclear_rush.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/nuclear_rush.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/nuclear_rush.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/nyctophobia.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/nyctophobia.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/nyctophobia.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/nyctophobia.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/shining.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/shining.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/shining.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/shining.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/solar_energy.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/solar_energy.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/solar_energy.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/solar_energy.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/sun_fueled.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/super_dash.json diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/totem_fueled.json b/src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json similarity index 100% rename from src/main/resources/data/terraoriginum/powers/monarchpowers/totem_fueled.json rename to src/main/resources/data/terraoriginum/powers/monarch-powers/totem_fueled.json