diff --git a/build.gradle b/build.gradle index 9b58adc..a71990d 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ version = project.mod_version group = project.maven_group repositories { + mavenLocal() maven { name "cloth config" url "https://maven.shedaniel.me" diff --git a/gradle.properties b/gradle.properties index cdf21c8..daddaa2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ yarn_mappings=1.20.1+build.10 loader_version=0.15.6 # Mod Properties -mod_version=1.20.1-0.0.1-PR +mod_version=1.20.1-1.0.3 maven_group=dev.arcmods archives_base_name=TerraOriginum diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java index 5231d25..4846283 100644 --- a/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/TerraOriginum.java @@ -2,6 +2,7 @@ package net.arcmods.arcteam.terraoriginum; import net.arcmods.arcteam.terraoriginum.blocks.cottonCropBlock; import net.arcmods.arcteam.terraoriginum.blocks.crucifix; +import net.arcmods.arcteam.terraoriginum.items.iconItems; import net.arcmods.arcteam.terraoriginum.items.cottonItems; import net.arcmods.arcteam.terraoriginum.items.mync_eye; import net.arcmods.arcteam.terraoriginum.items.sun_totem; @@ -22,7 +23,7 @@ public class TerraOriginum implements ModInitializer { @Override public void onInitialize() { umbrella.registerItems(); - mync_eye.register(); + iconItems.register(); modEnchantments.register(); crucifix.register(); cottonCropBlock.register(); diff --git a/src/main/java/net/arcmods/arcteam/terraoriginum/items/mync_eye.java b/src/main/java/net/arcmods/arcteam/terraoriginum/items/iconItems.java similarity index 70% rename from src/main/java/net/arcmods/arcteam/terraoriginum/items/mync_eye.java rename to src/main/java/net/arcmods/arcteam/terraoriginum/items/iconItems.java index 909b76b..8dec513 100644 --- a/src/main/java/net/arcmods/arcteam/terraoriginum/items/mync_eye.java +++ b/src/main/java/net/arcmods/arcteam/terraoriginum/items/iconItems.java @@ -7,12 +7,14 @@ import net.minecraft.util.Rarity; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; -public class mync_eye { +public class iconItems { public static final Item MYNC_EYE = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); + public static final Item SPIRIT = new Item(new Item.Settings().maxCount(1).rarity(Rarity.EPIC)); public static void register() { Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "mync_eye"), MYNC_EYE); + Registry.register(Registries.ITEM, new Identifier(TerraOriginum.MOD_ID, "spirit"), SPIRIT); } } diff --git a/src/main/resources/assets/terraoriginum.png b/src/main/resources/assets/terraoriginum.png new file mode 100644 index 0000000..d2f1ead Binary files /dev/null and b/src/main/resources/assets/terraoriginum.png differ diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 11bb188..d7d0a32 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -1,8 +1,10 @@ { //-----Icon Items-----// - "item.terraoriginum.mync_eye": "you shouldnt have this", + "item.terraoriginum.mync_eye": "Mync Eye", + "item.terraoriginum.spirit": "Spirit", "item.terraoriginum.umbrella": "Umbrella", + //-----shit i cant be assed to categorise-----/ "item.terraoriginum.cotton_seeds": "Cotton Seeds", "item.terraoriginum.cotton_ball": "Cotton ball", @@ -17,6 +19,8 @@ "death.attack.boiling": "%1$s boiled up", "death.attack.boiling.player": "%1$s boiled up whilst trying to fight off %2$s", + "enchantment.terraoriginum.sun_protection": "Sun Protection", + //-----Immortal Human-----// "origin.terraoriginum.immortal_human.name": "Immortal Human", "origin.terraoriginum.immortal_human.description": "You hate life, but out of spite, the gods cursed you with being immortal. How unfortunate.", @@ -173,12 +177,15 @@ "power.terraoriginum.kitsune-powers/run.description": "Whenever your health goes below 4 hearts, you gain a small speed boost", "power.terraoriginum.kitsune-powers/speed.name": "Small Frame", "power.terraoriginum.kitsune-powers/speed.description": "Your small frame gives little weight, making it easier to move at the cost of health.", - + //-----Yulde-----// "origin.terraoriginum.yulde.name": "Yulde", "origin.terraoriginum.yulde.description": "A Yulde is a Lato with the ability to change the tides of battle, at the cost of their lives.", "power.terraoriginum.yulde-powers/last_stand.name": "Last Stand", "power.terraoriginum.yulde-powers/last_stand.description": "You gain strength 4 and speed 2 for 60 seconds, after which you will, without fail, die.", + + "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.", //-----florian-----// "origin.terraoriginum.florian.name": "Florian", @@ -204,6 +211,10 @@ "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.", @@ -240,6 +251,4 @@ "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." } \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/models/item/spirit.json b/src/main/resources/assets/terraoriginum/models/item/spirit.json new file mode 100644 index 0000000..5f693e2 --- /dev/null +++ b/src/main/resources/assets/terraoriginum/models/item/spirit.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "terraoriginum:item/spirit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/textures/item/spirit.png b/src/main/resources/assets/terraoriginum/textures/item/spirit.png new file mode 100644 index 0000000..1ba29e5 Binary files /dev/null and b/src/main/resources/assets/terraoriginum/textures/item/spirit.png differ diff --git a/src/main/resources/data/minecraft/tags/functions/tick.json b/src/main/resources/data/minecraft/tags/functions/tick.json new file mode 100644 index 0000000..7f5e242 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/functions/tick.json @@ -0,0 +1,5 @@ +{ + "values": [ + "terraoriginum:tick" + ] +} \ 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 5e84047..2881d3a 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -14,6 +14,7 @@ "terraoriginum:florian", "terraoriginum:fairy", "terraoriginum:muckunde", + "terraoriginum:mync", "terraoriginum:monarch", { "condition": { diff --git a/src/main/resources/data/terraoriginum/origins/fairy.json b/src/main/resources/data/terraoriginum/origins/fairy.json index ad4e020..5cfb9ce 100644 --- a/src/main/resources/data/terraoriginum/origins/fairy.json +++ b/src/main/resources/data/terraoriginum/origins/fairy.json @@ -11,7 +11,7 @@ "origins:elytra", "origins:launch_into_air" ], - "icon": "minecraft:air", + "icon": "minecraft:amethyst_cluster", "order": 1007, "impact": 3 } diff --git a/src/main/resources/data/terraoriginum/origins/kitsune.json b/src/main/resources/data/terraoriginum/origins/kitsune.json index 52aa41e..4fa2f67 100644 --- a/src/main/resources/data/terraoriginum/origins/kitsune.json +++ b/src/main/resources/data/terraoriginum/origins/kitsune.json @@ -24,8 +24,8 @@ "terraoriginum:kitsune-powers/hungy", "terraoriginum:kitsune-powers/fox_eyes", "terraoriginum:kitsune-powers/monch", - "terraoriginum:kitsune-powers/home", - "terraoriginum:kitsune-powers/yum" + "terraoriginum:kitsune-powers/yum", + "terraoriginum:kitsune-powers/startbox" ], "icon": "minecraft:sweet_berries", "order": 1006, diff --git a/src/main/resources/data/terraoriginum/origins/spirit.json b/src/main/resources/data/terraoriginum/origins/spirit.json index e595bf9..2c2ea81 100644 --- a/src/main/resources/data/terraoriginum/origins/spirit.json +++ b/src/main/resources/data/terraoriginum/origins/spirit.json @@ -10,7 +10,7 @@ "terraoriginum:spirit-powers/undead", "terraoriginum:spirit-powers/nightvis" ], - "icon": "minecraft:air", + "icon": "terraoriginum:spirit", "order": 1001, "impact": 3 } diff --git a/src/main/resources/data/terraoriginum/origins/yulde.json b/src/main/resources/data/terraoriginum/origins/yulde.json index 862237d..45e7cde 100755 --- a/src/main/resources/data/terraoriginum/origins/yulde.json +++ b/src/main/resources/data/terraoriginum/origins/yulde.json @@ -17,7 +17,7 @@ "terraoriginum:lato-powers/tall_width", "terraoriginum:lato-powers/tall_width_hitbox" ], - "icon": "netherite_axe", + "icon": "creeper_head", "order": 998, "impact": 3 } diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/home.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/home.json deleted file mode 100644 index 21681de..0000000 --- a/src/main/resources/data/terraoriginum/powers/kitsune-powers/home.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "origins:modify_player_spawn", - "dimension": "minecraft:overworld", - "biome": "minecraft:taiga", - "spawn_strategy": "default" -} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/kitsune-powers/startbox.json b/src/main/resources/data/terraoriginum/powers/kitsune-powers/startbox.json new file mode 100644 index 0000000..44766a4 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/kitsune-powers/startbox.json @@ -0,0 +1,17 @@ +{ + "hidden": true, + "type": "origins:starting_equipment", + "stack": { + "item": "minecraft:book" + }, + "stacks": [ + { + "item": "minecraft:sweet_berries", + "amount": 32 + }, + { + "item": "minecraft:glow_berries", + "amount": 32 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 68eadb6..846e072 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -16,7 +16,7 @@ "repo": "https://github.com/BigGaemer/terra-originum" }, "license": "Custom License", - "icon": "assets/coconut.jpg", + "icon": "assets/terraoriginum.png", "environment": "*", "entrypoints": { "main": [