diff --git a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java index 68db416..13e6ebf 100644 --- a/src/main/java/com/smithy/terraoriginum/TerraOriginum.java +++ b/src/main/java/com/smithy/terraoriginum/TerraOriginum.java @@ -3,6 +3,7 @@ package com.smithy.terraoriginum; import com.smithy.terraoriginum.blocks.cottonCropBlock; import com.smithy.terraoriginum.blocks.crucifix; import com.smithy.terraoriginum.items.iconItems; +import com.smithy.terraoriginum.items.sun_totem; import com.smithy.terraoriginum.items.cottonItems; import com.smithy.terraoriginum.items.umbrella; import com.smithy.terraoriginum.registry.modEnchantments; @@ -26,8 +27,10 @@ public class TerraOriginum implements ModInitializer { crucifix.register(); cottonCropBlock.register(); cottonItems.register(); + sun_totem.register(); ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(umbrella.UMBRELLA)); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((content) -> content.add(sun_totem.SUN_TOTEM)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register((content) -> content.add(crucifix.CRUCIFIX)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register((content) -> content.add(cottonItems.COTTON_SEEDS)); ItemGroupEvents.modifyEntriesEvent(ItemGroups.INGREDIENTS).register((content) -> content.add(cottonItems.COTTON_BALL)); diff --git a/src/main/java/com/smithy/terraoriginum/items/sun_totem.java b/src/main/java/com/smithy/terraoriginum/items/sun_totem.java new file mode 100644 index 0000000..50eee4c --- /dev/null +++ b/src/main/java/com/smithy/terraoriginum/items/sun_totem.java @@ -0,0 +1,17 @@ +package com.smithy.terraoriginum.items; + +import com.smithy.terraoriginum.TerraOriginum; +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; + +public class sun_totem { + + public static final Item SUN_TOTEM = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); + + public static void register() { + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "sun_totem"), SUN_TOTEM); + } +} diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 344f9bd..2ac449b 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -8,9 +8,14 @@ "item.terraoriginum.cotton_seeds": "Cotton Seeds", "item.terraoriginum.cotton_ball": "Cotton ball", + "item.terraoriginum.sun_totem": "Sun Totem", + "death.attack.lack_of_ectoplasm": "%1$s faded away", "death.attack.lack_of_ectoplasm.player": "%1$s faded away whilst trying to escape %2$s", + "death.attack.lack_of_sun": "%1$s fell apart", + "death.attack.lack_of_sun.player": "%1$s fell apart whilst fighting %2$s", + "death.attack.boiling": "%1$s boiled up", "death.attack.boiling.player": "%1$s boiled up whilst trying to fight off %2$s", @@ -206,10 +211,6 @@ "power.terraoriginum.florian-powers/weak.name": "Weak", "power.terraoriginum.florian-powers/weak.description": "Because you are a creature of nature, you cannot do much damage.", - - "death.attack.terraoriginum:last_stand": "%1$s made their last stand.", - "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand before dying to %2$s.", - //-----Muckunde-----// "origin.terraoriginum.muckunde.name": "Muckunde", "origin.terraoriginum.muckunde.description": "A dirt creature often found borrowing underground.", @@ -228,7 +229,7 @@ "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", + "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", @@ -241,8 +242,9 @@ "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.terraoriginun.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/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" } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/sun_totem.json b/src/main/resources/assets/terraoriginum/models/item/sun_totem.json new file mode 100644 index 0000000..b804745 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/sun_totem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/sun_totem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/item/sun_totem.png b/src/main/resources/assets/terraoriginum/textures/item/sun_totem.png new file mode 100644 index 0000000..d1bfdf4 Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/item/sun_totem.png differ diff --git a/src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json b/src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json new file mode 100644 index 0000000..5d32957 --- /dev/null +++ b/src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json @@ -0,0 +1,5 @@ +{ + "exhaustion": 0.1, + "message_id": "lack_of_sun", + "scaling": "never" +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/origins/monarch.json b/src/main/resources/data/terraoriginum/origins/monarch.json index ea607dd..2cad63f 100644 --- a/src/main/resources/data/terraoriginum/origins/monarch.json +++ b/src/main/resources/data/terraoriginum/origins/monarch.json @@ -7,8 +7,10 @@ "terraoriginum:monarchpowers/hyperefficient_blood", "terraoriginum:monarchpowers/hydropetrification", "terraoriginum:monarchpowers/sun_fueled", + "terraoriginum:monarchpowers/totem_fueled", "terraoriginum:monarchpowers/nyctophobia", - "terraoriginum:monarchpowers/shining" + "terraoriginum:monarchpowers/shining", + "terraoriginum:monarchpowers/lackofsundamage" ], "icon": "fire_charge", "order": 999, diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json index d7b7995..64ad5cf 100644 --- a/src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/hydropetrification.json @@ -19,7 +19,7 @@ "type": "origins:apply_effect", "effect": { "effect": "minecraft:mining_fatigue", - "duration": 200, + "duration": 10, "amplifier": 2 } diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/lackofsundamage.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/lackofsundamage.json new file mode 100644 index 0000000..4f78cfb --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/lackofsundamage.json @@ -0,0 +1,24 @@ +{ + "type": "origins:action_over_time", + "hidden": true, + "interval": 20, + "entity_action": { + "type": "origins:if_else_list", + "actions": [ + { + "condition": { + "type": "origins:resource", + "resource": "terraoriginum:monarchpowers/solar_energy", + "comparison": "<", + "compare_to": 50 + }, + "action": { + "type": "origins:damage", + "amount": 6, + "damage_type": "terraoriginum:lack_of_sun" + } + + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json index 2c3efc0..4f79d4a 100644 --- a/src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/sun_fueled.json @@ -1,6 +1,6 @@ { "condition": { - "type": "origins:daytime" + "type": "origins:exposed_to_sun" }, "type": "origins:action_over_time", "interval": 40, diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json index d5fe0f1..2fac9b6 100644 --- a/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/super_dash.json @@ -14,7 +14,6 @@ { "type": "origins:execute_command", "command": "particle dust_color_transition 0.9 0.38 0 1 0.88 0.11 0.14 ~ ~1 ~ 0.5 0 0.5 10 100 force" - }, { "type": "origins:execute_command", @@ -23,7 +22,7 @@ { "type": "origins:change_resource", "resource": "terraoriginum:monarchpowers/solar_energy", - "change": -200 + "change": -300 } ] }, diff --git a/src/main/resources/data/terraoriginum/powers/monarchpowers/totem_fueled.json b/src/main/resources/data/terraoriginum/powers/monarchpowers/totem_fueled.json new file mode 100644 index 0000000..4865875 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/monarchpowers/totem_fueled.json @@ -0,0 +1,24 @@ +{ + "condition": { + "type": "origins:inventory", + "process_mode": "items", + "slots": [ + "weapon.mainhand", + "weapon.offhand" + ], + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "item": "terraoriginum:sun_totem" + } + } + }, + "type": "origins:action_over_time", + "interval": 40, + "entity_action": { + "type": "origins:change_resource", + "resource": "terraoriginum:monarchpowers/solar_energy", + "change": 4, + "operation": "add" + } + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/recipes/sun_totem.json b/src/main/resources/data/terraoriginum/recipes/sun_totem.json new file mode 100644 index 0000000..781bfc5 --- /dev/null +++ b/src/main/resources/data/terraoriginum/recipes/sun_totem.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " / ", + "#P#", + " / " + ], + "key": { + "#": { + "item": "minecraft:redstone" + }, + "/": { + "item": "minecraft:fire_charge" + }, + "P": { + "item": "minecraft:totem_of_undying" + } + }, + "result": { + "item": "terraoriginum:sun_totem", + "count": 1 + } + } \ No newline at end of file