From acd4d32e56cdf1ba2c40a765dbfebbdd25916b52 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Sun, 13 Oct 2024 13:01:11 +0530 Subject: [PATCH] Update for the 'Monarch' Origin -Changed the way sun energy works -Added sun totem -Added lack_of_sun damage type --- .../arcteam/terraoriginum/TerraOriginum.java | 3 +++ .../terraoriginum/items/sun_totem.java | 17 +++++++++++++ .../assets/terraoriginum/lang/en_us.json | 10 ++++++-- .../terraoriginum/models/item/sun_totem.json | 6 +++++ .../terraoriginum/textures/item/sun_totem.png | Bin 0 -> 440 bytes .../damage_type/lack_of_sun.json | 5 ++++ .../data/terraoriginum/origins/monarch.json | 4 ++- .../monarchpowers/hydropetrification.json | 2 +- .../powers/monarchpowers/lackofsundamage.json | 24 ++++++++++++++++++ .../powers/monarchpowers/sun_fueled.json | 2 +- .../powers/monarchpowers/super_dash.json | 1 - .../powers/monarchpowers/totem_fueled.json | 24 ++++++++++++++++++ .../data/terraoriginum/recipes/sun_totem.json | 23 +++++++++++++++++ 13 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 src/main/java/net/arcmods/arcteam/terraoriginum/items/sun_totem.java create mode 100644 src/main/resources/assets/terraoriginum/models/item/sun_totem.json create mode 100644 src/main/resources/assets/terraoriginum/textures/item/sun_totem.png create mode 100644 src/main/resources/data/terraoriginum/damage_type/lack_of_sun.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/lackofsundamage.json create mode 100644 src/main/resources/data/terraoriginum/powers/monarchpowers/totem_fueled.json create mode 100644 src/main/resources/data/terraoriginum/recipes/sun_totem.json diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java index 43f5cd5..5231d25 100644 --- a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java @@ -4,6 +4,7 @@ import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock; import net.arcmods.arcteam.terraoriginum.blocks.crucifix; import net.arcmods.arcteam.terraoriginum.items.cottonItems; import net.arcmods.arcteam.terraoriginum.items.mync_eye; +import net.arcmods.arcteam.terraoriginum.items.sun_totem; import net.arcmods.arcteam.terraoriginum.items.umbrella; import net.arcmods.arcteam.terraoriginum.registry.modEnchantments; import net.fabricmc.api.ModInitializer; @@ -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/net/arcmods/arcteam/terraoriginum/items/sun_totem.java b/src/main/java/net/arcmods/arcteam/terraoriginum/items/sun_totem.java new file mode 100644 index 0000000..9e29a72 --- /dev/null +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/items/sun_totem.java @@ -0,0 +1,17 @@ +package net.arcmods.arcteam.terraoriginum.items; + +import net.arcmods.arcteam.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 aee718e..11bb188 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -6,9 +6,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", @@ -217,7 +222,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", @@ -232,7 +237,8 @@ "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/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", "death.attack.terraoriginum:last_stand": "%1$s made their last stand.", "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand trying to kill %2$s." 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 0000000000000000000000000000000000000000..d1bfdf4ec5c7e1a42a50e8c096e2078fcbbe1f90 GIT binary patch literal 440 zcmV;p0Z0CcP)