diff --git a/.gitignore b/.gitignore index 36be3a9..308e07a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,9 @@ *.blend? *~ +### Minecraft +/src/generated/resources/.cache/* + ### Java template # Compiled class file *.class diff --git a/build.gradle b/build.gradle index 16460d7..0575ead 100644 --- a/build.gradle +++ b/build.gradle @@ -145,11 +145,14 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, neo_version : neo_version, + neo_version_range : neo_version_range, loader_version_range : loader_version_range, mod_id : mod_id, mod_name : mod_name, mod_license : mod_license, mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description, ] inputs.properties replaceProperties expand replaceProperties diff --git a/src/generated/resources/assets/totemofreviving/models/item/diamond_charge.json b/src/generated/resources/assets/totem_of_reviving/models/item/diamond_charge.json similarity index 53% rename from src/generated/resources/assets/totemofreviving/models/item/diamond_charge.json rename to src/generated/resources/assets/totem_of_reviving/models/item/diamond_charge.json index 5cbfbd2..8be9ea5 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/diamond_charge.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/diamond_charge.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/diamond_charge" + "layer0": "totem_of_reviving:item/diamond_charge" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/diamond_totem.json b/src/generated/resources/assets/totem_of_reviving/models/item/diamond_totem.json similarity index 54% rename from src/generated/resources/assets/totemofreviving/models/item/diamond_totem.json rename to src/generated/resources/assets/totem_of_reviving/models/item/diamond_totem.json index 295aaa1..660e9a7 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/diamond_totem.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/diamond_totem.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/diamond_totem" + "layer0": "totem_of_reviving:item/diamond_totem" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/iron_charge.json b/src/generated/resources/assets/totem_of_reviving/models/item/iron_charge.json similarity index 55% rename from src/generated/resources/assets/totemofreviving/models/item/iron_charge.json rename to src/generated/resources/assets/totem_of_reviving/models/item/iron_charge.json index 6341d17..36f468b 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/iron_charge.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/iron_charge.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/iron_charge" + "layer0": "totem_of_reviving:item/iron_charge" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/iron_totem.json b/src/generated/resources/assets/totem_of_reviving/models/item/iron_totem.json similarity index 55% rename from src/generated/resources/assets/totemofreviving/models/item/iron_totem.json rename to src/generated/resources/assets/totem_of_reviving/models/item/iron_totem.json index 60d6d4f..9fce0c1 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/iron_totem.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/iron_totem.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/iron_totem" + "layer0": "totem_of_reviving:item/iron_totem" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/netherite_charge.json b/src/generated/resources/assets/totem_of_reviving/models/item/netherite_charge.json similarity index 52% rename from src/generated/resources/assets/totemofreviving/models/item/netherite_charge.json rename to src/generated/resources/assets/totem_of_reviving/models/item/netherite_charge.json index cbab895..bcd7730 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/netherite_charge.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/netherite_charge.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/netherite_charge" + "layer0": "totem_of_reviving:item/netherite_charge" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/netherite_totem.json b/src/generated/resources/assets/totem_of_reviving/models/item/netherite_totem.json similarity index 53% rename from src/generated/resources/assets/totemofreviving/models/item/netherite_totem.json rename to src/generated/resources/assets/totem_of_reviving/models/item/netherite_totem.json index cdd587e..771d478 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/netherite_totem.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/netherite_totem.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/netherite_totem" + "layer0": "totem_of_reviving:item/netherite_totem" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json b/src/generated/resources/assets/totem_of_reviving/models/item/straw_charge.json similarity index 54% rename from src/generated/resources/assets/totemofreviving/models/item/straw_charge.json rename to src/generated/resources/assets/totem_of_reviving/models/item/straw_charge.json index 85c72a4..1c3550e 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/straw_charge.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/straw_charge.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/straw_charge" + "layer0": "totem_of_reviving:item/straw_charge" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/straw_totem.json b/src/generated/resources/assets/totem_of_reviving/models/item/straw_totem.json similarity index 55% rename from src/generated/resources/assets/totemofreviving/models/item/straw_totem.json rename to src/generated/resources/assets/totem_of_reviving/models/item/straw_totem.json index f8d8ea1..fc18764 100644 --- a/src/generated/resources/assets/totemofreviving/models/item/straw_totem.json +++ b/src/generated/resources/assets/totem_of_reviving/models/item/straw_totem.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/straw_totem" + "layer0": "totem_of_reviving:item/straw_totem" } } \ No newline at end of file diff --git a/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/diamond_charge.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/diamond_charge.json new file mode 100644 index 0000000..d146445 --- /dev/null +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/diamond_charge.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "totem_of_reviving:diamond_totem" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "totem_of_reviving:diamond_charge" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "totem_of_reviving:diamond_charge" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/diamond_totem.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/diamond_totem.json new file mode 100644 index 0000000..70bb426 --- /dev/null +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/diamond_totem.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "minecraft:totem_of_undying" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "totem_of_reviving:diamond_totem" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "totem_of_reviving:diamond_totem" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/iron_charge.json similarity index 62% rename from src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json rename to src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/iron_charge.json index f7a271b..b656702 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/iron_charge.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "totemofreviving:iron_totem" - ] + "items": "totem_of_reviving:iron_totem" } ] }, @@ -15,21 +13,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "totemofreviving:iron_charge" + "recipe": "totem_of_reviving:iron_charge" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", - "has_the_recipe" + "has_the_recipe", + "has_item" ] ], "rewards": { "recipes": [ - "totemofreviving:iron_charge" + "totem_of_reviving:iron_charge" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/iron_totem.json similarity index 63% rename from src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json rename to src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/iron_totem.json index ad81002..f1ef482 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/iron_totem.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:emerald" - ] + "items": "minecraft:emerald" } ] }, @@ -15,21 +13,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "totemofreviving:iron_totem" + "recipe": "totem_of_reviving:iron_totem" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", - "has_the_recipe" + "has_the_recipe", + "has_item" ] ], "rewards": { "recipes": [ - "totemofreviving:iron_totem" + "totem_of_reviving:iron_totem" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/netherite_charge.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/netherite_charge.json new file mode 100644 index 0000000..e6f68b7 --- /dev/null +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/netherite_charge.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "totem_of_reviving:netherite_totem" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "totem_of_reviving:netherite_charge" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "totem_of_reviving:netherite_charge" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/netherite_totem.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/netherite_totem.json new file mode 100644 index 0000000..80c60b3 --- /dev/null +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/netherite_totem.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_item": { + "conditions": { + "items": [ + { + "items": "minecraft:netherite_scrap" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "totem_of_reviving:netherite_totem" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_item" + ] + ], + "rewards": { + "recipes": [ + "totem_of_reviving:netherite_totem" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/straw_charge.json similarity index 61% rename from src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json rename to src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/straw_charge.json index a887932..86525be 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/straw_charge.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "totemofreviving:straw_totem" - ] + "items": "totem_of_reviving:straw_totem" } ] }, @@ -15,21 +13,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "totemofreviving:straw_charge" + "recipe": "totem_of_reviving:straw_charge" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", - "has_the_recipe" + "has_the_recipe", + "has_item" ] ], "rewards": { "recipes": [ - "totemofreviving:straw_charge" + "totem_of_reviving:straw_charge" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/straw_totem.json similarity index 63% rename from src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json rename to src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/straw_totem.json index 28934fb..d820c84 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json +++ b/src/generated/resources/data/totem_of_reviving/advancement/recipes/tools/straw_totem.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:wheat" - ] + "items": "minecraft:wheat" } ] }, @@ -15,21 +13,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "totemofreviving:straw_totem" + "recipe": "totem_of_reviving:straw_totem" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_item", - "has_the_recipe" + "has_the_recipe", + "has_item" ] ], "rewards": { "recipes": [ - "totemofreviving:straw_totem" + "totem_of_reviving:straw_totem" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/diamond_charge.json b/src/generated/resources/data/totem_of_reviving/recipe/diamond_charge.json similarity index 82% rename from src/generated/resources/data/totemofreviving/recipes/diamond_charge.json rename to src/generated/resources/data/totem_of_reviving/recipe/diamond_charge.json index 5e5d63f..cdeb763 100644 --- a/src/generated/resources/data/totemofreviving/recipes/diamond_charge.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/diamond_charge.json @@ -21,7 +21,7 @@ "IDI" ], "result": { - "item": "totemofreviving:diamond_charge" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:diamond_charge" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/diamond_totem.json b/src/generated/resources/data/totem_of_reviving/recipe/diamond_totem.json similarity index 80% rename from src/generated/resources/data/totemofreviving/recipes/diamond_totem.json rename to src/generated/resources/data/totem_of_reviving/recipe/diamond_totem.json index 0a3cbe7..2ca3a4f 100644 --- a/src/generated/resources/data/totemofreviving/recipes/diamond_totem.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/diamond_totem.json @@ -18,7 +18,7 @@ "EDE" ], "result": { - "item": "totemofreviving:diamond_totem" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:diamond_totem" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/iron_charge.json b/src/generated/resources/data/totem_of_reviving/recipe/iron_charge.json similarity index 80% rename from src/generated/resources/data/totemofreviving/recipes/iron_charge.json rename to src/generated/resources/data/totem_of_reviving/recipe/iron_charge.json index 2a6fed9..7e6b875 100644 --- a/src/generated/resources/data/totemofreviving/recipes/iron_charge.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/iron_charge.json @@ -18,7 +18,7 @@ "NIN" ], "result": { - "item": "totemofreviving:iron_charge" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:iron_charge" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/iron_totem.json b/src/generated/resources/data/totem_of_reviving/recipe/iron_totem.json similarity index 80% rename from src/generated/resources/data/totemofreviving/recipes/iron_totem.json rename to src/generated/resources/data/totem_of_reviving/recipe/iron_totem.json index f564102..d53b164 100644 --- a/src/generated/resources/data/totemofreviving/recipes/iron_totem.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/iron_totem.json @@ -18,7 +18,7 @@ " I " ], "result": { - "item": "totemofreviving:iron_totem" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:iron_totem" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/netherite_charge.json b/src/generated/resources/data/totem_of_reviving/recipe/netherite_charge.json similarity index 69% rename from src/generated/resources/data/totemofreviving/recipes/netherite_charge.json rename to src/generated/resources/data/totem_of_reviving/recipe/netherite_charge.json index 3622fcc..9bb4b6a 100644 --- a/src/generated/resources/data/totemofreviving/recipes/netherite_charge.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/netherite_charge.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "C": { - "item": "totemofreviving:diamond_charge" + "item": "totem_of_reviving:diamond_charge" }, "G": { "item": "minecraft:gold_ingot" @@ -18,7 +18,7 @@ "GNG" ], "result": { - "item": "totemofreviving:netherite_charge" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:netherite_charge" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/netherite_totem.json b/src/generated/resources/data/totem_of_reviving/recipe/netherite_totem.json similarity index 73% rename from src/generated/resources/data/totemofreviving/recipes/netherite_totem.json rename to src/generated/resources/data/totem_of_reviving/recipe/netherite_totem.json index 1d4f243..de94ab6 100644 --- a/src/generated/resources/data/totemofreviving/recipes/netherite_totem.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/netherite_totem.json @@ -12,7 +12,7 @@ "item": "minecraft:netherite_scrap" }, "T": { - "item": "totemofreviving:diamond_totem" + "item": "totem_of_reviving:diamond_totem" } }, "pattern": [ @@ -21,7 +21,7 @@ "BGB" ], "result": { - "item": "totemofreviving:netherite_totem" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:netherite_totem" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_charge.json b/src/generated/resources/data/totem_of_reviving/recipe/straw_charge.json similarity index 80% rename from src/generated/resources/data/totemofreviving/recipes/straw_charge.json rename to src/generated/resources/data/totem_of_reviving/recipe/straw_charge.json index 785551c..49ce348 100644 --- a/src/generated/resources/data/totemofreviving/recipes/straw_charge.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/straw_charge.json @@ -18,7 +18,7 @@ "NWN" ], "result": { - "item": "totemofreviving:straw_charge" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:straw_charge" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_totem.json b/src/generated/resources/data/totem_of_reviving/recipe/straw_totem.json similarity index 82% rename from src/generated/resources/data/totemofreviving/recipes/straw_totem.json rename to src/generated/resources/data/totem_of_reviving/recipe/straw_totem.json index 4ce2287..e2d3e99 100644 --- a/src/generated/resources/data/totemofreviving/recipes/straw_totem.json +++ b/src/generated/resources/data/totem_of_reviving/recipe/straw_totem.json @@ -21,7 +21,7 @@ "N|N" ], "result": { - "item": "totemofreviving:straw_totem" - }, - "show_notification": true + "count": 1, + "id": "totem_of_reviving:straw_totem" + } } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json deleted file mode 100644 index 10a7794..0000000 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "totemofreviving:diamond_totem" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "totemofreviving:diamond_charge" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "totemofreviving:diamond_charge" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json deleted file mode 100644 index 8c4f65c..0000000 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:totem_of_undying" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "totemofreviving:diamond_totem" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "totemofreviving:diamond_totem" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json deleted file mode 100644 index fb06f38..0000000 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "totemofreviving:netherite_totem" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "totemofreviving:netherite_charge" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "totemofreviving:netherite_charge" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json deleted file mode 100644 index 0a1e827..0000000 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_item": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:netherite_scrap" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "totemofreviving:netherite_totem" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "totemofreviving:netherite_totem" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java b/src/main/java/dev/micle/totem_of_reviving/TotemOfReviving.java similarity index 90% rename from src/main/java/dev/micle/totemofreviving/TotemOfReviving.java rename to src/main/java/dev/micle/totem_of_reviving/TotemOfReviving.java index 4ae6bda..3cf2337 100644 --- a/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java +++ b/src/main/java/dev/micle/totem_of_reviving/TotemOfReviving.java @@ -1,7 +1,7 @@ -package dev.micle.totemofreviving; +package dev.micle.totem_of_reviving; -import dev.micle.totemofreviving.proxy.IProxy; -import dev.micle.totemofreviving.proxy.Proxy; +import dev.micle.totem_of_reviving.proxy.IProxy; +import dev.micle.totem_of_reviving.proxy.Proxy; import net.minecraft.resources.ResourceLocation; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.IEventBus; diff --git a/src/main/java/dev/micle/totemofreviving/component/TotemData.java b/src/main/java/dev/micle/totem_of_reviving/component/TotemData.java similarity index 98% rename from src/main/java/dev/micle/totemofreviving/component/TotemData.java rename to src/main/java/dev/micle/totem_of_reviving/component/TotemData.java index baa02fe..dbd739d 100644 --- a/src/main/java/dev/micle/totemofreviving/component/TotemData.java +++ b/src/main/java/dev/micle/totem_of_reviving/component/TotemData.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.component; +package dev.micle.totem_of_reviving.component; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java b/src/main/java/dev/micle/totem_of_reviving/data/DataGenerators.java similarity index 87% rename from src/main/java/dev/micle/totemofreviving/data/DataGenerators.java rename to src/main/java/dev/micle/totem_of_reviving/data/DataGenerators.java index 0117288..be8b965 100644 --- a/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java +++ b/src/main/java/dev/micle/totem_of_reviving/data/DataGenerators.java @@ -1,6 +1,6 @@ -package dev.micle.totemofreviving.data; +package dev.micle.totem_of_reviving.data; -import dev.micle.totemofreviving.data.client.ModItemModelProvider; +import dev.micle.totem_of_reviving.data.client.ModItemModelProvider; import net.minecraft.data.DataGenerator; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; diff --git a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java b/src/main/java/dev/micle/totem_of_reviving/data/ModRecipeProvider.java similarity index 96% rename from src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java rename to src/main/java/dev/micle/totem_of_reviving/data/ModRecipeProvider.java index a41de69..530c1f0 100644 --- a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java +++ b/src/main/java/dev/micle/totem_of_reviving/data/ModRecipeProvider.java @@ -1,8 +1,7 @@ -package dev.micle.totemofreviving.data; +package dev.micle.totem_of_reviving.data; -import dev.micle.totemofreviving.setup.ModItems; +import dev.micle.totem_of_reviving.setup.ModItems; import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.RecipeOutput; diff --git a/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java b/src/main/java/dev/micle/totem_of_reviving/data/client/ModItemModelProvider.java similarity index 68% rename from src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java rename to src/main/java/dev/micle/totem_of_reviving/data/client/ModItemModelProvider.java index 14710e2..64a1b24 100644 --- a/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java +++ b/src/main/java/dev/micle/totem_of_reviving/data/client/ModItemModelProvider.java @@ -1,14 +1,14 @@ -package dev.micle.totemofreviving.data.client; +package dev.micle.totem_of_reviving.data.client; -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.item.charge.DiamondChargeItem; -import dev.micle.totemofreviving.item.charge.IronChargeItem; -import dev.micle.totemofreviving.item.charge.NetheriteChargeItem; -import dev.micle.totemofreviving.item.charge.StrawChargeItem; -import dev.micle.totemofreviving.item.totem.DiamondTotemItem; -import dev.micle.totemofreviving.item.totem.IronTotemItem; -import dev.micle.totemofreviving.item.totem.NetheriteTotemItem; -import dev.micle.totemofreviving.item.totem.StrawTotemItem; +import dev.micle.totem_of_reviving.TotemOfReviving; +import dev.micle.totem_of_reviving.item.charge.DiamondChargeItem; +import dev.micle.totem_of_reviving.item.charge.IronChargeItem; +import dev.micle.totem_of_reviving.item.charge.NetheriteChargeItem; +import dev.micle.totem_of_reviving.item.charge.StrawChargeItem; +import dev.micle.totem_of_reviving.item.totem.DiamondTotemItem; +import dev.micle.totem_of_reviving.item.totem.IronTotemItem; +import dev.micle.totem_of_reviving.item.totem.NetheriteTotemItem; +import dev.micle.totem_of_reviving.item.totem.StrawTotemItem; import net.minecraft.data.DataGenerator; import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; import net.neoforged.neoforge.client.model.generators.ItemModelProvider; diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java b/src/main/java/dev/micle/totem_of_reviving/item/charge/ChargeItem.java similarity index 95% rename from src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/charge/ChargeItem.java index 5c4d369..1433a9c 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/charge/ChargeItem.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.item.charge; +package dev.micle.totem_of_reviving.item.charge; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java b/src/main/java/dev/micle/totem_of_reviving/item/charge/DiamondChargeItem.java similarity index 83% rename from src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/charge/DiamondChargeItem.java index 387e30b..17a4d18 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/charge/DiamondChargeItem.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.item.charge; +package dev.micle.totem_of_reviving.item.charge; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java b/src/main/java/dev/micle/totem_of_reviving/item/charge/IronChargeItem.java similarity index 82% rename from src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/charge/IronChargeItem.java index e6e0084..f508826 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/charge/IronChargeItem.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.item.charge; +package dev.micle.totem_of_reviving.item.charge; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java b/src/main/java/dev/micle/totem_of_reviving/item/charge/NetheriteChargeItem.java similarity index 83% rename from src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/charge/NetheriteChargeItem.java index d3e2f74..4022007 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/charge/NetheriteChargeItem.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.item.charge; +package dev.micle.totem_of_reviving.item.charge; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java b/src/main/java/dev/micle/totem_of_reviving/item/charge/StrawChargeItem.java similarity index 83% rename from src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/charge/StrawChargeItem.java index 72e0fbc..53ee330 100644 --- a/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/charge/StrawChargeItem.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.item.charge; +package dev.micle.totem_of_reviving.item.charge; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java b/src/main/java/dev/micle/totem_of_reviving/item/totem/DiamondTotemItem.java similarity index 77% rename from src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/totem/DiamondTotemItem.java index 21089d8..fb37201 100644 --- a/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/totem/DiamondTotemItem.java @@ -1,7 +1,7 @@ -package dev.micle.totemofreviving.item.totem; +package dev.micle.totem_of_reviving.item.totem; -import dev.micle.totemofreviving.item.charge.DiamondChargeItem; -import dev.micle.totemofreviving.setup.Config; +import dev.micle.totem_of_reviving.item.charge.DiamondChargeItem; +import dev.micle.totem_of_reviving.setup.Config; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java b/src/main/java/dev/micle/totem_of_reviving/item/totem/IronTotemItem.java similarity index 77% rename from src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/totem/IronTotemItem.java index 1f7f2f1..6d83384 100644 --- a/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/totem/IronTotemItem.java @@ -1,7 +1,7 @@ -package dev.micle.totemofreviving.item.totem; +package dev.micle.totem_of_reviving.item.totem; -import dev.micle.totemofreviving.item.charge.IronChargeItem; -import dev.micle.totemofreviving.setup.Config; +import dev.micle.totem_of_reviving.item.charge.IronChargeItem; +import dev.micle.totem_of_reviving.setup.Config; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java b/src/main/java/dev/micle/totem_of_reviving/item/totem/NetheriteTotemItem.java similarity index 77% rename from src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/totem/NetheriteTotemItem.java index c74464d..19760eb 100644 --- a/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/totem/NetheriteTotemItem.java @@ -1,7 +1,7 @@ -package dev.micle.totemofreviving.item.totem; +package dev.micle.totem_of_reviving.item.totem; -import dev.micle.totemofreviving.item.charge.NetheriteChargeItem; -import dev.micle.totemofreviving.setup.Config; +import dev.micle.totem_of_reviving.item.charge.NetheriteChargeItem; +import dev.micle.totem_of_reviving.setup.Config; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java b/src/main/java/dev/micle/totem_of_reviving/item/totem/StrawTotemItem.java similarity index 77% rename from src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/totem/StrawTotemItem.java index e5d226c..c587a87 100644 --- a/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/totem/StrawTotemItem.java @@ -1,7 +1,7 @@ -package dev.micle.totemofreviving.item.totem; +package dev.micle.totem_of_reviving.item.totem; -import dev.micle.totemofreviving.item.charge.StrawChargeItem; -import dev.micle.totemofreviving.setup.Config; +import dev.micle.totem_of_reviving.item.charge.StrawChargeItem; +import dev.micle.totem_of_reviving.setup.Config; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Rarity; diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java b/src/main/java/dev/micle/totem_of_reviving/item/totem/TotemItem.java similarity index 97% rename from src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java rename to src/main/java/dev/micle/totem_of_reviving/item/totem/TotemItem.java index 2249149..47cae3e 100644 --- a/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java +++ b/src/main/java/dev/micle/totem_of_reviving/item/totem/TotemItem.java @@ -1,9 +1,9 @@ -package dev.micle.totemofreviving.item.totem; +package dev.micle.totem_of_reviving.item.totem; -import dev.micle.totemofreviving.component.TotemData; -import dev.micle.totemofreviving.setup.Config; -import dev.micle.totemofreviving.setup.ModDataComponents; -import dev.micle.totemofreviving.setup.ModKeyMappings; +import dev.micle.totem_of_reviving.component.TotemData; +import dev.micle.totem_of_reviving.setup.Config; +import dev.micle.totem_of_reviving.setup.ModDataComponents; +import dev.micle.totem_of_reviving.setup.ModKeyMappings; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/dev/micle/totemofreviving/network/NetworkManager.java b/src/main/java/dev/micle/totem_of_reviving/network/NetworkManager.java similarity index 80% rename from src/main/java/dev/micle/totemofreviving/network/NetworkManager.java rename to src/main/java/dev/micle/totem_of_reviving/network/NetworkManager.java index 3bc4fb7..bd3b80c 100644 --- a/src/main/java/dev/micle/totemofreviving/network/NetworkManager.java +++ b/src/main/java/dev/micle/totem_of_reviving/network/NetworkManager.java @@ -1,9 +1,4 @@ -package dev.micle.totemofreviving.network; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.network.client.ChangeTargetPacket; -import dev.micle.totemofreviving.network.client.ChargeTotemPacket; -import dev.micle.totemofreviving.network.client.ReviveTargetPacket; +package dev.micle.totem_of_reviving.network; public class NetworkManager { // // Initialize variables diff --git a/src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java b/src/main/java/dev/micle/totem_of_reviving/network/client/ChangeTargetPacket.java similarity index 75% rename from src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java rename to src/main/java/dev/micle/totem_of_reviving/network/client/ChangeTargetPacket.java index 06e9be9..873d8cb 100644 --- a/src/main/java/dev/micle/totemofreviving/network/client/ChangeTargetPacket.java +++ b/src/main/java/dev/micle/totem_of_reviving/network/client/ChangeTargetPacket.java @@ -1,16 +1,4 @@ -package dev.micle.totemofreviving.network.client; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.item.totem.TotemItem; -import net.minecraft.ChatFormatting; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.players.PlayerList; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.item.ItemStack; - -import java.util.function.Supplier; +package dev.micle.totem_of_reviving.network.client; public class ChangeTargetPacket { // private final InteractionHand hand; diff --git a/src/main/java/dev/micle/totemofreviving/network/client/ChargeTotemPacket.java b/src/main/java/dev/micle/totem_of_reviving/network/client/ChargeTotemPacket.java similarity index 79% rename from src/main/java/dev/micle/totemofreviving/network/client/ChargeTotemPacket.java rename to src/main/java/dev/micle/totem_of_reviving/network/client/ChargeTotemPacket.java index 6cb6922..c2199e8 100644 --- a/src/main/java/dev/micle/totemofreviving/network/client/ChargeTotemPacket.java +++ b/src/main/java/dev/micle/totem_of_reviving/network/client/ChargeTotemPacket.java @@ -1,12 +1,4 @@ -package dev.micle.totemofreviving.network.client; - -import dev.micle.totemofreviving.item.totem.TotemItem; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.item.ItemStack; - -import java.util.function.Supplier; +package dev.micle.totem_of_reviving.network.client; public class ChargeTotemPacket { // private final InteractionHand hand; diff --git a/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java b/src/main/java/dev/micle/totem_of_reviving/network/client/ReviveTargetPacket.java similarity index 85% rename from src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java rename to src/main/java/dev/micle/totem_of_reviving/network/client/ReviveTargetPacket.java index 3f67f90..d526777 100644 --- a/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java +++ b/src/main/java/dev/micle/totem_of_reviving/network/client/ReviveTargetPacket.java @@ -1,15 +1,4 @@ -package dev.micle.totemofreviving.network.client; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.item.totem.TotemItem; -import net.minecraft.ChatFormatting; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.item.ItemStack; - -import java.util.function.Supplier; +package dev.micle.totem_of_reviving.network.client; public class ReviveTargetPacket { // private final InteractionHand hand; diff --git a/src/main/java/dev/micle/totemofreviving/proxy/IProxy.java b/src/main/java/dev/micle/totem_of_reviving/proxy/IProxy.java similarity index 88% rename from src/main/java/dev/micle/totemofreviving/proxy/IProxy.java rename to src/main/java/dev/micle/totem_of_reviving/proxy/IProxy.java index 98c834a..db68237 100644 --- a/src/main/java/dev/micle/totemofreviving/proxy/IProxy.java +++ b/src/main/java/dev/micle/totem_of_reviving/proxy/IProxy.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.proxy; +package dev.micle.totem_of_reviving.proxy; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/dev/micle/totemofreviving/proxy/Proxy.java b/src/main/java/dev/micle/totem_of_reviving/proxy/Proxy.java similarity index 93% rename from src/main/java/dev/micle/totemofreviving/proxy/Proxy.java rename to src/main/java/dev/micle/totem_of_reviving/proxy/Proxy.java index 4fdeb42..0dc55c5 100644 --- a/src/main/java/dev/micle/totemofreviving/proxy/Proxy.java +++ b/src/main/java/dev/micle/totem_of_reviving/proxy/Proxy.java @@ -1,8 +1,7 @@ -package dev.micle.totemofreviving.proxy; +package dev.micle.totem_of_reviving.proxy; -import dev.micle.totemofreviving.network.NetworkManager; -import dev.micle.totemofreviving.setup.Config; -import dev.micle.totemofreviving.setup.Registration; +import dev.micle.totem_of_reviving.setup.Config; +import dev.micle.totem_of_reviving.setup.Registration; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/dev/micle/totemofreviving/setup/Config.java b/src/main/java/dev/micle/totem_of_reviving/setup/Config.java similarity index 93% rename from src/main/java/dev/micle/totemofreviving/setup/Config.java rename to src/main/java/dev/micle/totem_of_reviving/setup/Config.java index 9c19840..996ff2c 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/Config.java +++ b/src/main/java/dev/micle/totem_of_reviving/setup/Config.java @@ -1,9 +1,9 @@ -package dev.micle.totemofreviving.setup; +package dev.micle.totem_of_reviving.setup; -import dev.micle.totemofreviving.item.totem.DiamondTotemItem; -import dev.micle.totemofreviving.item.totem.IronTotemItem; -import dev.micle.totemofreviving.item.totem.NetheriteTotemItem; -import dev.micle.totemofreviving.item.totem.StrawTotemItem; +import dev.micle.totem_of_reviving.item.totem.DiamondTotemItem; +import dev.micle.totem_of_reviving.item.totem.IronTotemItem; +import dev.micle.totem_of_reviving.item.totem.NetheriteTotemItem; +import dev.micle.totem_of_reviving.item.totem.StrawTotemItem; import net.neoforged.fml.ModContainer; import net.neoforged.fml.config.ModConfig; import net.neoforged.neoforge.common.ModConfigSpec; diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java b/src/main/java/dev/micle/totem_of_reviving/setup/ModCreativeModeTabs.java similarity index 92% rename from src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java rename to src/main/java/dev/micle/totem_of_reviving/setup/ModCreativeModeTabs.java index b3f96f2..e526a87 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java +++ b/src/main/java/dev/micle/totem_of_reviving/setup/ModCreativeModeTabs.java @@ -1,6 +1,6 @@ -package dev.micle.totemofreviving.setup; +package dev.micle.totem_of_reviving.setup; -import dev.micle.totemofreviving.TotemOfReviving; +import dev.micle.totem_of_reviving.TotemOfReviving; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; import net.neoforged.neoforge.registries.DeferredHolder; diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModDataComponents.java b/src/main/java/dev/micle/totem_of_reviving/setup/ModDataComponents.java similarity index 83% rename from src/main/java/dev/micle/totemofreviving/setup/ModDataComponents.java rename to src/main/java/dev/micle/totem_of_reviving/setup/ModDataComponents.java index 727d3d9..a2324f4 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModDataComponents.java +++ b/src/main/java/dev/micle/totem_of_reviving/setup/ModDataComponents.java @@ -1,6 +1,6 @@ -package dev.micle.totemofreviving.setup; +package dev.micle.totem_of_reviving.setup; -import dev.micle.totemofreviving.component.TotemData; +import dev.micle.totem_of_reviving.component.TotemData; import net.minecraft.core.component.DataComponentType; import net.neoforged.neoforge.registries.DeferredHolder; diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModItems.java b/src/main/java/dev/micle/totem_of_reviving/setup/ModItems.java similarity index 68% rename from src/main/java/dev/micle/totemofreviving/setup/ModItems.java rename to src/main/java/dev/micle/totem_of_reviving/setup/ModItems.java index 4374708..c836bcf 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModItems.java +++ b/src/main/java/dev/micle/totem_of_reviving/setup/ModItems.java @@ -1,13 +1,13 @@ -package dev.micle.totemofreviving.setup; +package dev.micle.totem_of_reviving.setup; -import dev.micle.totemofreviving.item.charge.DiamondChargeItem; -import dev.micle.totemofreviving.item.charge.IronChargeItem; -import dev.micle.totemofreviving.item.charge.NetheriteChargeItem; -import dev.micle.totemofreviving.item.charge.StrawChargeItem; -import dev.micle.totemofreviving.item.totem.DiamondTotemItem; -import dev.micle.totemofreviving.item.totem.IronTotemItem; -import dev.micle.totemofreviving.item.totem.NetheriteTotemItem; -import dev.micle.totemofreviving.item.totem.StrawTotemItem; +import dev.micle.totem_of_reviving.item.charge.DiamondChargeItem; +import dev.micle.totem_of_reviving.item.charge.IronChargeItem; +import dev.micle.totem_of_reviving.item.charge.NetheriteChargeItem; +import dev.micle.totem_of_reviving.item.charge.StrawChargeItem; +import dev.micle.totem_of_reviving.item.totem.DiamondTotemItem; +import dev.micle.totem_of_reviving.item.totem.IronTotemItem; +import dev.micle.totem_of_reviving.item.totem.NetheriteTotemItem; +import dev.micle.totem_of_reviving.item.totem.StrawTotemItem; import net.minecraft.world.item.Item; import net.neoforged.neoforge.registries.DeferredItem; diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java b/src/main/java/dev/micle/totem_of_reviving/setup/ModKeyMappings.java similarity index 86% rename from src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java rename to src/main/java/dev/micle/totem_of_reviving/setup/ModKeyMappings.java index 6d531b1..4b3f025 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java +++ b/src/main/java/dev/micle/totem_of_reviving/setup/ModKeyMappings.java @@ -1,4 +1,4 @@ -package dev.micle.totemofreviving.setup; +package dev.micle.totem_of_reviving.setup; import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; diff --git a/src/main/java/dev/micle/totemofreviving/setup/Registration.java b/src/main/java/dev/micle/totem_of_reviving/setup/Registration.java similarity index 87% rename from src/main/java/dev/micle/totemofreviving/setup/Registration.java rename to src/main/java/dev/micle/totem_of_reviving/setup/Registration.java index 71b951a..9217224 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/Registration.java +++ b/src/main/java/dev/micle/totem_of_reviving/setup/Registration.java @@ -1,7 +1,6 @@ -package dev.micle.totemofreviving.setup; +package dev.micle.totem_of_reviving.setup; -import dev.micle.totemofreviving.TotemOfReviving; -import net.minecraft.core.component.DataComponentType; +import dev.micle.totem_of_reviving.TotemOfReviving; import net.minecraft.core.registries.Registries; import net.minecraft.world.item.CreativeModeTab; import net.neoforged.bus.api.IEventBus; diff --git a/src/main/resources/assets/totem_of_reviving/lang/en_us.json b/src/main/resources/assets/totem_of_reviving/lang/en_us.json new file mode 100644 index 0000000..bd1aab9 --- /dev/null +++ b/src/main/resources/assets/totem_of_reviving/lang/en_us.json @@ -0,0 +1,12 @@ +{ + "itemGroup.totem_of_reviving.main": "Micle's Totem of Reviving", + "item.totem_of_reviving.straw_totem": "Straw totem of reviving", + "item.totem_of_reviving.iron_totem": "Iron totem of reviving", + "item.totem_of_reviving.diamond_totem": "Diamond totem of reviving", + "item.totem_of_reviving.netherite_totem": "Netherite totem of reviving", + "item.totem_of_reviving.straw_charge": "Straw reviving charge", + "item.totem_of_reviving.iron_charge": "Iron reviving charge", + "item.totem_of_reviving.diamond_charge": "Diamond reviving charge", + "item.totem_of_reviving.netherite_charge": "Netherite reviving charge", + "advanced_tooltips": "advanced_tooltips" +} \ No newline at end of file diff --git a/src/main/resources/assets/totemofreviving/textures/item/diamond_charge.png b/src/main/resources/assets/totem_of_reviving/textures/item/diamond_charge.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/diamond_charge.png rename to src/main/resources/assets/totem_of_reviving/textures/item/diamond_charge.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/diamond_totem.png b/src/main/resources/assets/totem_of_reviving/textures/item/diamond_totem.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/diamond_totem.png rename to src/main/resources/assets/totem_of_reviving/textures/item/diamond_totem.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/iron_charge.png b/src/main/resources/assets/totem_of_reviving/textures/item/iron_charge.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/iron_charge.png rename to src/main/resources/assets/totem_of_reviving/textures/item/iron_charge.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/iron_totem.png b/src/main/resources/assets/totem_of_reviving/textures/item/iron_totem.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/iron_totem.png rename to src/main/resources/assets/totem_of_reviving/textures/item/iron_totem.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/netherite_charge.png b/src/main/resources/assets/totem_of_reviving/textures/item/netherite_charge.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/netherite_charge.png rename to src/main/resources/assets/totem_of_reviving/textures/item/netherite_charge.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/netherite_totem.png b/src/main/resources/assets/totem_of_reviving/textures/item/netherite_totem.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/netherite_totem.png rename to src/main/resources/assets/totem_of_reviving/textures/item/netherite_totem.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/straw_charge.png b/src/main/resources/assets/totem_of_reviving/textures/item/straw_charge.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/straw_charge.png rename to src/main/resources/assets/totem_of_reviving/textures/item/straw_charge.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/straw_totem.png b/src/main/resources/assets/totem_of_reviving/textures/item/straw_totem.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/straw_totem.png rename to src/main/resources/assets/totem_of_reviving/textures/item/straw_totem.png diff --git a/src/main/resources/assets/totemofreviving/lang/en_us.json b/src/main/resources/assets/totemofreviving/lang/en_us.json deleted file mode 100644 index 58ea6bf..0000000 --- a/src/main/resources/assets/totemofreviving/lang/en_us.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "itemGroup.totemofreviving.main": "Micle's Totem of Reviving", - "item.totemofreviving.straw_totem": "Straw totem of reviving", - "item.totemofreviving.iron_totem": "Iron totem of reviving", - "item.totemofreviving.diamond_totem": "Diamond totem of reviving", - "item.totemofreviving.netherite_totem": "Netherite totem of reviving", - "item.totemofreviving.straw_charge": "Straw reviving charge", - "item.totemofreviving.iron_charge": "Iron reviving charge", - "item.totemofreviving.diamond_charge": "Diamond reviving charge", - "item.totemofreviving.netherite_charge": "Netherite reviving charge", - "advanced_tooltips": "advanced_tooltips" -} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 2c2cf31..9f4951c 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "totemofreviving resources", + "description": "totem_of_reviving resources", "pack_format": 8 } } diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml similarity index 92% rename from src/main/resources/META-INF/neoforge.mods.toml rename to src/main/templates/META-INF/neoforge.mods.toml index 36e0af6..639861b 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -9,7 +9,7 @@ version = "${mod_version}" displayName = "${mod_name}" #updateJSONURL="http://myurl.me/" #displayURL="http://example.com/" -logoFile="logo.jpg" +logoFile= "logo.jpg" #credits="" authors="${mod_authors}" description = '''${mod_description}''' @@ -20,17 +20,17 @@ description = '''${mod_description}''' #[[accessTransformers]] #file="META-INF/accesstransformer.cfg" -[[dependencies."${mod_id}"]] +[[dependencies.${mod_id}]] modId = "neoforge" # The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive). # 'required' requires the mod to exist, 'optional' does not # 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning type = "required" - versionRange = "${forge_version_range}" + versionRange = "${neo_version_range}" ordering = "NONE" # BEFORE, AFTER, NONE side = "BOTH" # BOTH, CLIENT, SERVER -[[dependencies."${mod_id}"]] +[[dependencies.${mod_id}]] modId = "minecraft" type = "required" versionRange = "${minecraft_version_range}"