diff --git a/src/main/java/com/smithy/faithful/Faithful.java b/src/main/java/com/smithy/faithful/Faithful.java index 4ac23a2..4f87035 100644 --- a/src/main/java/com/smithy/faithful/Faithful.java +++ b/src/main/java/com/smithy/faithful/Faithful.java @@ -17,7 +17,7 @@ public class Faithful implements ModInitializer { public void onInitialize() { IconItems.register(); ModPowers.register(); - + LOGGER.info("man this Origins is " + MOD_ID); } } diff --git a/src/main/java/com/smithy/faithful/util/TerraHelper.java b/src/main/java/com/smithy/faithful/util/TerraHelper.java deleted file mode 100644 index 594f0f2..0000000 --- a/src/main/java/com/smithy/faithful/util/TerraHelper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.smithy.faithful.util; - -import net.minecraft.entity.Entity; - -public class TerraHelper { - - public static boolean isWet(Entity entity) { - return entity.isWet(); - } -} \ No newline at end of file diff --git a/src/main/resources/assets/faithful/lang/en_us.json b/src/main/resources/assets/faithful/lang/en_us.json index 50cdbde..beb1864 100644 --- a/src/main/resources/assets/faithful/lang/en_us.json +++ b/src/main/resources/assets/faithful/lang/en_us.json @@ -1,13 +1,13 @@ { //-----Muckunde-----// - "origin.faithful.sth.name": "something", - "origin.faithful.sth.description": "filthy", - "power.faithful.muckunde-powers/toughskin.name": "Tough Skin", - "power.faithful.muckunde-powers/toughskin.description": "A muckunde has hard skin, giving it some natural armour", - "power.faithful.muckunde-powers/likesoil1.name": "Like Soil", - "power.faithful.muckunde-powers/likesoil1.description": "The muckunde has the ability to phase through any dirt-like blocks.", - "power.faithful.muckunde-powers/yummybeets.name": "Yummy Beets", - "power.faithful.muckunde-powers/yummybeets.description": "Your body makes good use of the nutritional composition of beetroot", - "power.faithful.muckunde-powers/hydrophobic.name": "Hydrophobic", - "power.faithful.muckunde-powers/hydrophobic.description": "Your body completely ignores water" + "origin.faithful.elf.name": "Elf", + "origin.faithful.elf.description": "Prideful, elegant beings of earthly origin.", + "power.faithful.elf-powers/elven_craftsmanship.name": "Elven Magic", + "power.faithful.elf-powers/elven_craftsmanship.description": "Elven craftsmanship is often described as containing enchantments. Elves themselves use these words to simplify how elvish weapons seem to have a quality no other races could achieve.", + "power.faithful.elf-powers/elven_health.name": "Elven Health", + "power.faithful.elf-powers/elven_health.description": "Elves are immune to some poisons.", + "power.faithful.elf-powers/light_foot.name": "Light of Foot", + "power.faithful.elf-powers/light_foot.description": "Elves can walk lightly across snow where the boots of humans would sink.", + "power.faithful.elf-powers/nature_connection.name": "Nature's Connection", + "power.faithful.elf-powers/nature_connection.description": "When in biomes such as forests or jungles, elves may receive certain buffs." } \ No newline at end of file diff --git a/src/main/resources/data/faithful/item_modifiers/elf_bow.json b/src/main/resources/data/faithful/item_modifiers/elf_bow.json new file mode 100644 index 0000000..f6942fe --- /dev/null +++ b/src/main/resources/data/faithful/item_modifiers/elf_bow.json @@ -0,0 +1,21 @@ +[ + { + "function": "minecraft:set_enchantments", + "enchantments": { + "minecraft:power": 1 + }, + "add": true + }, + { + "function": "minecraft:set_lore", + "entity": "this", + "lore": [ + { + "text": "An Elven crafted weapon.", + "color": "dark_purple", + "italic": true + } + ], + "replace": true + } +] \ No newline at end of file diff --git a/src/main/resources/data/faithful/item_modifiers/elf_crossbow.json b/src/main/resources/data/faithful/item_modifiers/elf_crossbow.json new file mode 100644 index 0000000..64f5636 --- /dev/null +++ b/src/main/resources/data/faithful/item_modifiers/elf_crossbow.json @@ -0,0 +1,21 @@ +[ + { + "function": "minecraft:set_enchantments", + "enchantments": { + "minecraft:piercing": 1 + }, + "add": true + }, + { + "function": "minecraft:set_lore", + "entity": "this", + "lore": [ + { + "text": "An Elven crafted weapon.", + "color": "dark_purple", + "italic": true + } + ], + "replace": true + } +] \ No newline at end of file diff --git a/src/main/resources/data/faithful/item_modifiers/elf_sharpness.json b/src/main/resources/data/faithful/item_modifiers/elf_sharpness.json new file mode 100644 index 0000000..a220b2c --- /dev/null +++ b/src/main/resources/data/faithful/item_modifiers/elf_sharpness.json @@ -0,0 +1,20 @@ +[ + { + "function": "minecraft:set_lore", + "entity": "this", + "lore": [ + { + "text": "An Elven crafted weapon.", + "color": "dark_purple", + "italic": true + } + ], + "replace": true + }, + { + "function": "minecraft:set_enchantments", + "enchantments": { + "minecraft:sharpness": 1 + } + } +] \ No newline at end of file diff --git a/src/main/resources/data/faithful/origins/elf.json b/src/main/resources/data/faithful/origins/elf.json index efe34d3..0d35799 100644 --- a/src/main/resources/data/faithful/origins/elf.json +++ b/src/main/resources/data/faithful/origins/elf.json @@ -1,8 +1,11 @@ { "powers": [ - "faithful:wings" + "faithful:elf-powers/elven_craftsmanship", + "faithful:elf-powers/nature_connection", + "faithful:elf-powers/elven_health", + "faithful:elf-powers/light_foot" ], "icon": "minecraft:dirt", - "order": 1008, + "order": 1000, "impact": 3 } diff --git a/src/main/resources/data/faithful/powers/elf-powers/elven_craftsmanship.json b/src/main/resources/data/faithful/powers/elf-powers/elven_craftsmanship.json new file mode 100644 index 0000000..625d93c --- /dev/null +++ b/src/main/resources/data/faithful/powers/elf-powers/elven_craftsmanship.json @@ -0,0 +1,59 @@ +{ + "type": "origins:multiple", + "alter_diamond_sword": { + "type": "origins:modify_crafting", + "recipe": "diamond_sword", + "item_action": { + "type": "origins:modify", + "modifier": "faithful:elf_sharpness" + } + }, + "alter_gold_sword": { + "type": "origins:modify_crafting", + "recipe": "golden_sword", + "item_action": { + "type": "origins:modify", + "modifier": "faithful:elf_sharpness" + } + }, + "alter_iron": { + "type": "origins:modify_crafting", + "recipe": "faithful:iron_sword", + "item_action": { + "type": "origins:modify", + "modifier": "faithful:elf_sharpness" + } + }, + "alter_stone": { + "type": "origins:modify_crafting", + "recipe": "faithful:stone_sword", + "item_action": { + "type": "origins:modify", + "modifier": "faithful:elf_sharpness" + } + }, + "alter_wooden_sword": { + "type": "origins:modify_crafting", + "recipe": "wooden_sword", + "item_action": { + "type": "origins:modify", + "modifier": "faithful:elf_sharpness" + } + }, + "alter_bow": { + "type": "origins:modify_crafting", + "recipe": "minecraft:bow", + "item_action": { + "type": "origins:modify", + "modifier": "faithful:elf_bow" + } + }, + "alter_crossbow": { + "type": "origins:modify_crafting", + "recipe": "minecraft:crossbow", + "item_action": { + "type": "origins:modify", + "modifier": "faithful:elf_crossbow" + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/faithful/powers/elf-powers/elven_health.json b/src/main/resources/data/faithful/powers/elf-powers/elven_health.json new file mode 100644 index 0000000..b4cefff --- /dev/null +++ b/src/main/resources/data/faithful/powers/elf-powers/elven_health.json @@ -0,0 +1,10 @@ +{ + "type": "origins:effect_immunity", + "effects": [ + "minecraft:wither", + "minecraft:poison", + "minecraft:nausea", + "minecraft:hunger", + "minecraft:blindness" + ] +} diff --git a/src/main/resources/data/faithful/powers/elf-powers/light_foot.json b/src/main/resources/data/faithful/powers/elf-powers/light_foot.json new file mode 100644 index 0000000..5322c60 --- /dev/null +++ b/src/main/resources/data/faithful/powers/elf-powers/light_foot.json @@ -0,0 +1,3 @@ +{ + "type": "faithful:can_walk_on_powder_snow" +} \ No newline at end of file diff --git a/src/main/resources/data/faithful/powers/elf-powers/nature_connection.json b/src/main/resources/data/faithful/powers/elf-powers/nature_connection.json index 5b3ce88..ac21305 100644 --- a/src/main/resources/data/faithful/powers/elf-powers/nature_connection.json +++ b/src/main/resources/data/faithful/powers/elf-powers/nature_connection.json @@ -1,15 +1,27 @@ { "condition": { - "type": "origins:in_tag", - "tag": "faithful:forests" + "type": "origins:biome", + "condition": { + "type": "origins:category", + "category": "forest" + } }, "type": "origins:action_over_time", - "interval": 20, + "interval": 5, "entity_action": { "type": "origins:apply_effect", "effects": [ { - "effect": "minecraft:strength" + "effect": "minecraft:strength", + "duration": 35, + "show_particles": false, + "show_icon": false + }, + { + "effect": "minecraft:speed", + "duration": 35, + "show_particles": false, + "show_icon": false } ] } diff --git a/src/main/resources/data/faithful/recipes/iron_sword.json b/src/main/resources/data/faithful/recipes/iron_sword.json new file mode 100644 index 0000000..fd30a01 --- /dev/null +++ b/src/main/resources/data/faithful/recipes/iron_sword.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "item": "minecraft:iron_ingot" + } + }, + "pattern": [ + "X", + "X", + "#" + ], + "result": { + "item": "minecraft:iron_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/faithful/recipes/stone_sword.json b/src/main/resources/data/faithful/recipes/stone_sword.json new file mode 100644 index 0000000..aba9cf2 --- /dev/null +++ b/src/main/resources/data/faithful/recipes/stone_sword.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "minecraft:stick" + }, + "X": { + "tag": "minecraft:stone_tool_materials" + } + }, + "pattern": [ + "X", + "X", + "#" + ], + "result": { + "item": "minecraft:stone_sword" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/iron_sword.json b/src/main/resources/data/minecraft/recipes/iron_sword.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/iron_sword.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/stone_sword.json b/src/main/resources/data/minecraft/recipes/stone_sword.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/stone_sword.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/src/main/resources/data/origins/origin_layers/origin.json b/src/main/resources/data/origins/origin_layers/origin.json index 8e0de0d..4b24c0d 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -1,7 +1,7 @@ { "replace": false, "origins": [ - "faithful:sth", + "faithful:elf", { "condition": { "type": "origins:equipped_item",