From a6c7673d8ffdcc815c22f998a3fc09b1ee0cc868 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 19 Jan 2022 03:46:29 +0000 Subject: [PATCH] Ported 1.16.5-2.0.1 to 1.17.1. --- src/generated/resources/.cache/cache | 32 ++- ...viving_charge.json => diamond_charge.json} | 2 +- ...em_of_reviving.json => diamond_totem.json} | 2 +- .../models/item/iron_charge.json | 6 + .../models/item/iron_totem.json | 6 + .../models/item/netherite_charge.json | 6 + .../models/item/netherite_totem.json | 6 + .../diamond_charge.json} | 6 +- .../diamond_totem.json} | 4 +- .../recipes/totemofreviving/iron_charge.json | 34 +++ .../recipes/totemofreviving/iron_totem.json | 34 +++ .../totemofreviving/netherite_charge.json | 34 +++ .../totemofreviving/netherite_totem.json | 34 +++ .../straw_charge.json | 2 +- .../straw_totem.json | 0 .../recipes/diamond_charge.json | 25 ++ .../recipes/diamond_totem.json | 22 ++ .../totemofreviving/recipes/iron_charge.json | 22 ++ .../totemofreviving/recipes/iron_totem.json | 22 ++ .../recipes/netherite_charge.json | 22 ++ .../recipes/netherite_totem.json | 25 ++ .../recipes/reviving_charge.json | 22 -- .../totemofreviving/recipes/straw_charge.json | 16 +- .../totemofreviving/recipes/straw_totem.json | 6 +- .../recipes/totem_of_reviving.json | 19 -- .../dev/micle/totemofreviving/ISideProxy.java | 13 + .../dev/micle/totemofreviving/SideProxy.java | 100 +++++++ .../totemofreviving/TotemOfReviving.java | 91 +++--- .../micle/totemofreviving/config/Config.java | 95 +++++++ .../totemofreviving/data/DataGenerators.java | 18 +- .../data/ModRecipeProvider.java | 123 ++++++--- .../data/client/ModItemModelProvider.java | 31 ++- .../events/ServerTickEventHandler.java | 13 - .../item/charge/ChargeItem.java | 49 ++++ .../item/charge/DiamondChargeItem.java | 13 + .../item/charge/IronChargeItem.java | 9 + .../item/charge/NetheriteChargeItem.java | 13 + .../item/charge/StrawChargeItem.java | 13 + .../item/crafting/ChargeRecipe.java | 33 +++ .../item/crafting/ExtendedShapedRecipe.java | 88 ++++++ .../crafting/ExtendedShapedRecipeBuilder.java | 184 +++++++++++++ .../item/crafting/TotemRecipe.java | 33 +++ .../item/totem/DiamondTotemItem.java | 21 ++ .../item/totem/IronTotemItem.java | 20 ++ .../item/totem/NetheriteTotemItem.java | 26 ++ .../item/totem/StrawTotemItem.java | 21 ++ .../totemofreviving/item/totem/TotemItem.java | 259 ++++++++++++++++++ .../items/RevivingChargeItem.java | 11 - .../items/StrawChargeItem.java | 11 - .../totemofreviving/items/StrawTotemItem.java | 81 ------ .../items/TotemOfRevivingItem.java | 77 ------ .../network/C2SRequestPlayerRevive.java | 86 ------ .../network/C2SRequestTotemCharge.java | 63 ----- .../network/C2SRequestTotemTarget.java | 52 ---- .../network/ChangeTargetPacket.java | 55 ++++ .../network/ChargeTotemPacket.java | 45 +++ .../totemofreviving/network/Network.java | 83 ++++++ .../network/ReviveTargetPacket.java | 73 +++++ .../micle/totemofreviving/setup/ModItems.java | 30 +- .../totemofreviving/setup/ModKeyMappings.java | 3 +- .../totemofreviving/setup/ModRecipes.java | 16 ++ .../totemofreviving/setup/Registration.java | 25 +- .../util/MismatchedVersionException.java | 7 + .../micle/totemofreviving/utils/Utils.java | 19 -- .../assets/totemofreviving/lang/en_us.json | 13 +- ...reviving_charge.png => diamond_charge.png} | Bin ...otem_of_reviving.png => diamond_totem.png} | Bin .../textures/item/iron_charge.png | Bin 0 -> 721 bytes .../textures/item/iron_totem.png | Bin 0 -> 826 bytes .../textures/item/netherite_charge.png | Bin 0 -> 741 bytes .../textures/item/netherite_totem.png | Bin 0 -> 836 bytes .../textures/item/straw_charge.png | Bin .../textures/item/straw_totem.png | Bin 73 files changed, 1814 insertions(+), 611 deletions(-) rename src/generated/resources/assets/totemofreviving/models/item/{reviving_charge.json => diamond_charge.json} (54%) mode change 100755 => 100644 rename src/generated/resources/assets/totemofreviving/models/item/{totem_of_reviving.json => diamond_totem.json} (53%) mode change 100755 => 100644 create mode 100644 src/generated/resources/assets/totemofreviving/models/item/iron_charge.json create mode 100644 src/generated/resources/assets/totemofreviving/models/item/iron_totem.json create mode 100644 src/generated/resources/assets/totemofreviving/models/item/netherite_charge.json create mode 100644 src/generated/resources/assets/totemofreviving/models/item/netherite_totem.json rename src/generated/resources/data/totemofreviving/advancements/recipes/{misc/reviving_charge.json => totemofreviving/diamond_charge.json} (77%) mode change 100755 => 100644 rename src/generated/resources/data/totemofreviving/advancements/recipes/{misc/totem_of_reviving.json => totemofreviving/diamond_totem.json} (84%) mode change 100755 => 100644 create mode 100644 src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_charge.json create mode 100644 src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_totem.json create mode 100644 src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_charge.json create mode 100644 src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_totem.json rename src/generated/resources/data/totemofreviving/advancements/recipes/{misc => totemofreviving}/straw_charge.json (92%) mode change 100755 => 100644 rename src/generated/resources/data/totemofreviving/advancements/recipes/{misc => totemofreviving}/straw_totem.json (100%) mode change 100755 => 100644 create mode 100644 src/generated/resources/data/totemofreviving/recipes/diamond_charge.json create mode 100644 src/generated/resources/data/totemofreviving/recipes/diamond_totem.json create mode 100644 src/generated/resources/data/totemofreviving/recipes/iron_charge.json create mode 100644 src/generated/resources/data/totemofreviving/recipes/iron_totem.json create mode 100644 src/generated/resources/data/totemofreviving/recipes/netherite_charge.json create mode 100644 src/generated/resources/data/totemofreviving/recipes/netherite_totem.json delete mode 100755 src/generated/resources/data/totemofreviving/recipes/reviving_charge.json delete mode 100755 src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json create mode 100644 src/main/java/dev/micle/totemofreviving/ISideProxy.java create mode 100644 src/main/java/dev/micle/totemofreviving/SideProxy.java create mode 100644 src/main/java/dev/micle/totemofreviving/config/Config.java delete mode 100755 src/main/java/dev/micle/totemofreviving/events/ServerTickEventHandler.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/crafting/ChargeRecipe.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipe.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipeBuilder.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/crafting/TotemRecipe.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java create mode 100644 src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java delete mode 100755 src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java delete mode 100755 src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java delete mode 100755 src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java delete mode 100755 src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java delete mode 100755 src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java delete mode 100755 src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java delete mode 100755 src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java create mode 100644 src/main/java/dev/micle/totemofreviving/network/ChangeTargetPacket.java create mode 100644 src/main/java/dev/micle/totemofreviving/network/ChargeTotemPacket.java create mode 100644 src/main/java/dev/micle/totemofreviving/network/Network.java create mode 100644 src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java create mode 100644 src/main/java/dev/micle/totemofreviving/setup/ModRecipes.java create mode 100644 src/main/java/dev/micle/totemofreviving/util/MismatchedVersionException.java delete mode 100755 src/main/java/dev/micle/totemofreviving/utils/Utils.java rename src/main/resources/assets/totemofreviving/textures/item/{reviving_charge.png => diamond_charge.png} (100%) rename src/main/resources/assets/totemofreviving/textures/item/{totem_of_reviving.png => diamond_totem.png} (100%) create mode 100755 src/main/resources/assets/totemofreviving/textures/item/iron_charge.png create mode 100755 src/main/resources/assets/totemofreviving/textures/item/iron_totem.png create mode 100755 src/main/resources/assets/totemofreviving/textures/item/netherite_charge.png create mode 100755 src/main/resources/assets/totemofreviving/textures/item/netherite_totem.png mode change 100755 => 100644 src/main/resources/assets/totemofreviving/textures/item/straw_charge.png mode change 100755 => 100644 src/main/resources/assets/totemofreviving/textures/item/straw_totem.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index f5015e5..125d37b 100755 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1,12 +1,24 @@ -8a2b88672a3111967914bf84746ee02770dc8aca assets/totemofreviving/models/item/reviving_charge.json +8cb64e3801a8d717442aa39d4ba230bc762d44d5 assets/totemofreviving/models/item/diamond_charge.json +8369d36bbe5dba40b58258caafdc6e92096709e0 assets/totemofreviving/models/item/diamond_totem.json +d0616a5bf6dd99b6bf56d8af19273dae480b9b3d assets/totemofreviving/models/item/iron_charge.json +096cdf824c293ef8aba92d3133ccc8717ba7220c assets/totemofreviving/models/item/iron_totem.json +ebd87c84c4b34b81bdf803c3c3cbc929e340302e assets/totemofreviving/models/item/netherite_charge.json +b5ebbedcd843aaf7a304ca67e9412e7765c07d59 assets/totemofreviving/models/item/netherite_totem.json 6dfda0ccc2ea9fde90748a9fac81e6e122375b60 assets/totemofreviving/models/item/straw_charge.json 70680f30f3471070d6d4121f0787eb7e2a9d7318 assets/totemofreviving/models/item/straw_totem.json -9802f8a76c014c4e7d5b093643a0f8f2c75474bc assets/totemofreviving/models/item/totem_of_reviving.json -0e09481eaaa250d77584eb7059af1a77899dc9e8 data/totemofreviving/advancements/recipes/misc/reviving_charge.json -5ab9178c303218866a6835209ebce170828feff7 data/totemofreviving/advancements/recipes/misc/straw_charge.json -cc5486c1b8f4f9ffab354a36aea6f9f25f759baa data/totemofreviving/advancements/recipes/misc/straw_totem.json -274ea09a02dbcd94967ead25ec3c396e4a16bd8f data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json -0a4143689809621511c8e586e6f030e2dd7a5927 data/totemofreviving/recipes/reviving_charge.json -72f1af6072cd28ad40e07d67256f2611bcb2d924 data/totemofreviving/recipes/straw_charge.json -ffba47b4fb65503d8143a387b05e191301b2b895 data/totemofreviving/recipes/straw_totem.json -8d9f9d28b0748d5dacbf0824b8f6531a6a00bbfa data/totemofreviving/recipes/totem_of_reviving.json +3f061b24013b07c54641f61f2cd263b79fd09289 data/totemofreviving/advancements/recipes/totemofreviving/diamond_charge.json +ff23bfcfdfb4547ec6081a51708389d0e0765137 data/totemofreviving/advancements/recipes/totemofreviving/diamond_totem.json +0fffc80cbee0e1a0bb06520899db9357d85ed50f data/totemofreviving/advancements/recipes/totemofreviving/iron_charge.json +f99838db89a20d46edfe7663a2e557042c972c25 data/totemofreviving/advancements/recipes/totemofreviving/iron_totem.json +92d491a63dd6e2cefeafae3ce2473128f1febd09 data/totemofreviving/advancements/recipes/totemofreviving/netherite_charge.json +86bbc66aeb90e39f5683432a4845ed81b9d0604e data/totemofreviving/advancements/recipes/totemofreviving/netherite_totem.json +7b81b4048e1ae103874eb31837ca83945fc2e89c data/totemofreviving/advancements/recipes/totemofreviving/straw_charge.json +cc5486c1b8f4f9ffab354a36aea6f9f25f759baa data/totemofreviving/advancements/recipes/totemofreviving/straw_totem.json +55ee18c38e521feb4b8271e39a021c1215616e6d data/totemofreviving/recipes/diamond_charge.json +3383e970befe8cdc2344ee3a75b7601012a9490f data/totemofreviving/recipes/diamond_totem.json +cfce0a5c8a8598a994e6ba4290a8682782c095db data/totemofreviving/recipes/iron_charge.json +042713134f03852fbcc84f50523441801591245d data/totemofreviving/recipes/iron_totem.json +fd5884ac05c111741230992cf8491cd745b61706 data/totemofreviving/recipes/netherite_charge.json +fd0ce554aa6b14ebe0a0c77504fe7fd966147bf7 data/totemofreviving/recipes/netherite_totem.json +34210409c71afd345b237efd6928b387654c76f8 data/totemofreviving/recipes/straw_charge.json +b78c2abd8ad4889226f0a534c3982ff9a9fe1880 data/totemofreviving/recipes/straw_totem.json diff --git a/src/generated/resources/assets/totemofreviving/models/item/reviving_charge.json b/src/generated/resources/assets/totemofreviving/models/item/diamond_charge.json old mode 100755 new mode 100644 similarity index 54% rename from src/generated/resources/assets/totemofreviving/models/item/reviving_charge.json rename to src/generated/resources/assets/totemofreviving/models/item/diamond_charge.json index 393b156..5cbfbd2 --- a/src/generated/resources/assets/totemofreviving/models/item/reviving_charge.json +++ b/src/generated/resources/assets/totemofreviving/models/item/diamond_charge.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/reviving_charge" + "layer0": "totemofreviving:item/diamond_charge" } } \ No newline at end of file diff --git a/src/generated/resources/assets/totemofreviving/models/item/totem_of_reviving.json b/src/generated/resources/assets/totemofreviving/models/item/diamond_totem.json old mode 100755 new mode 100644 similarity index 53% rename from src/generated/resources/assets/totemofreviving/models/item/totem_of_reviving.json rename to src/generated/resources/assets/totemofreviving/models/item/diamond_totem.json index 9295aaf..295aaa1 --- a/src/generated/resources/assets/totemofreviving/models/item/totem_of_reviving.json +++ b/src/generated/resources/assets/totemofreviving/models/item/diamond_totem.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "totemofreviving:item/totem_of_reviving" + "layer0": "totemofreviving: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/totemofreviving/models/item/iron_charge.json new file mode 100644 index 0000000..6341d17 --- /dev/null +++ b/src/generated/resources/assets/totemofreviving/models/item/iron_charge.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "totemofreviving: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/totemofreviving/models/item/iron_totem.json new file mode 100644 index 0000000..60d6d4f --- /dev/null +++ b/src/generated/resources/assets/totemofreviving/models/item/iron_totem.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "totemofreviving: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/totemofreviving/models/item/netherite_charge.json new file mode 100644 index 0000000..cbab895 --- /dev/null +++ b/src/generated/resources/assets/totemofreviving/models/item/netherite_charge.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "totemofreviving: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/totemofreviving/models/item/netherite_totem.json new file mode 100644 index 0000000..cdd587e --- /dev/null +++ b/src/generated/resources/assets/totemofreviving/models/item/netherite_totem.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "totemofreviving:item/netherite_totem" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/reviving_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/diamond_charge.json old mode 100755 new mode 100644 similarity index 77% rename from src/generated/resources/data/totemofreviving/advancements/recipes/misc/reviving_charge.json rename to src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/diamond_charge.json index 4ba6b14..30f7066 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/reviving_charge.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/diamond_charge.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "totemofreviving:reviving_charge" + "totemofreviving:diamond_charge" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "totemofreviving:totem_of_reviving" + "totemofreviving:diamond_totem" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "totemofreviving:reviving_charge" + "recipe": "totemofreviving:diamond_charge" } } }, diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/diamond_totem.json old mode 100755 new mode 100644 similarity index 84% rename from src/generated/resources/data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json rename to src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/diamond_totem.json index 5f50a4c..675d846 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/totem_of_reviving.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/diamond_totem.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "totemofreviving:totem_of_reviving" + "totemofreviving:diamond_totem" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "totemofreviving:totem_of_reviving" + "recipe": "totemofreviving:diamond_totem" } } }, diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_charge.json new file mode 100644 index 0000000..c8524a5 --- /dev/null +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_charge.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "totemofreviving:iron_charge" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "totemofreviving:iron_totem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "totemofreviving:iron_charge" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_totem.json new file mode 100644 index 0000000..c223cc3 --- /dev/null +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/iron_totem.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "totemofreviving:iron_totem" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:emerald" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "totemofreviving:iron_totem" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_charge.json new file mode 100644 index 0000000..83bc10b --- /dev/null +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_charge.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "totemofreviving:netherite_charge" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "totemofreviving:netherite_totem" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "totemofreviving:netherite_charge" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_totem.json new file mode 100644 index 0000000..8ecf2c3 --- /dev/null +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/netherite_totem.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "totemofreviving:netherite_totem" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "minecraft:netherite_scrap" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "totemofreviving:netherite_totem" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/straw_charge.json old mode 100755 new mode 100644 similarity index 92% rename from src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json rename to src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/straw_charge.json index a04d263..ba74046 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_charge.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/straw_charge.json @@ -12,7 +12,7 @@ "items": [ { "items": [ - "minecraft:emerald" + "totemofreviving:straw_totem" ] } ] diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/straw_totem.json old mode 100755 new mode 100644 similarity index 100% rename from src/generated/resources/data/totemofreviving/advancements/recipes/misc/straw_totem.json rename to src/generated/resources/data/totemofreviving/advancements/recipes/totemofreviving/straw_totem.json diff --git a/src/generated/resources/data/totemofreviving/recipes/diamond_charge.json b/src/generated/resources/data/totemofreviving/recipes/diamond_charge.json new file mode 100644 index 0000000..c456ca3 --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/diamond_charge.json @@ -0,0 +1,25 @@ +{ + "type": "totemofreviving:totem_recipe", + "pattern": [ + "IDI", + "PEP", + "IDI" + ], + "key": { + "E": { + "item": "minecraft:emerald" + }, + "D": { + "item": "minecraft:diamond" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "P": { + "item": "minecraft:ender_pearl" + } + }, + "result": { + "item": "totemofreviving: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/totemofreviving/recipes/diamond_totem.json new file mode 100644 index 0000000..731576c --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/diamond_totem.json @@ -0,0 +1,22 @@ +{ + "type": "totemofreviving:totem_recipe", + "pattern": [ + "EDE", + "DTD", + "EDE" + ], + "key": { + "T": { + "item": "minecraft:totem_of_undying" + }, + "D": { + "item": "minecraft:diamond" + }, + "E": { + "item": "minecraft:ender_pearl" + } + }, + "result": { + "item": "totemofreviving: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/totemofreviving/recipes/iron_charge.json new file mode 100644 index 0000000..d9047ba --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/iron_charge.json @@ -0,0 +1,22 @@ +{ + "type": "totemofreviving:charge_recipe", + "pattern": [ + "NIN", + "IEI", + "NIN" + ], + "key": { + "E": { + "item": "minecraft:emerald" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "N": { + "item": "minecraft:iron_nugget" + } + }, + "result": { + "item": "totemofreviving: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/totemofreviving/recipes/iron_totem.json new file mode 100644 index 0000000..8633d2c --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/iron_totem.json @@ -0,0 +1,22 @@ +{ + "type": "totemofreviving:totem_recipe", + "pattern": [ + " E ", + "IBI", + " I " + ], + "key": { + "B": { + "item": "minecraft:iron_block" + }, + "E": { + "item": "minecraft:emerald" + }, + "I": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "item": "totemofreviving: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/totemofreviving/recipes/netherite_charge.json new file mode 100644 index 0000000..1b247d3 --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/netherite_charge.json @@ -0,0 +1,22 @@ +{ + "type": "totemofreviving:charge_recipe", + "pattern": [ + "GNG", + "NCN", + "GNG" + ], + "key": { + "C": { + "item": "totemofreviving:diamond_charge" + }, + "N": { + "item": "minecraft:netherite_scrap" + }, + "G": { + "item": "minecraft:gold_ingot" + } + }, + "result": { + "item": "totemofreviving: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/totemofreviving/recipes/netherite_totem.json new file mode 100644 index 0000000..5cf767e --- /dev/null +++ b/src/generated/resources/data/totemofreviving/recipes/netherite_totem.json @@ -0,0 +1,25 @@ +{ + "type": "totemofreviving:totem_recipe", + "pattern": [ + "BNB", + "NTN", + "BGB" + ], + "key": { + "T": { + "item": "totemofreviving:diamond_totem" + }, + "N": { + "item": "minecraft:netherite_scrap" + }, + "G": { + "item": "minecraft:gold_ingot" + }, + "B": { + "item": "minecraft:nether_brick" + } + }, + "result": { + "item": "totemofreviving:netherite_totem" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/reviving_charge.json b/src/generated/resources/data/totemofreviving/recipes/reviving_charge.json deleted file mode 100755 index 34426eb..0000000 --- a/src/generated/resources/data/totemofreviving/recipes/reviving_charge.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "@E@", - "E#E", - "@E@" - ], - "key": { - "#": { - "item": "minecraft:totem_of_undying" - }, - "@": { - "item": "minecraft:diamond_block" - }, - "E": { - "item": "minecraft:ender_pearl" - } - }, - "result": { - "item": "totemofreviving:reviving_charge" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_charge.json b/src/generated/resources/data/totemofreviving/recipes/straw_charge.json index c9669bb..875e21a 100755 --- a/src/generated/resources/data/totemofreviving/recipes/straw_charge.json +++ b/src/generated/resources/data/totemofreviving/recipes/straw_charge.json @@ -1,19 +1,19 @@ { - "type": "minecraft:crafting_shaped", + "type": "totemofreviving:charge_recipe", "pattern": [ - "IWI", + "NWN", "WEW", - "IWI" + "NWN" ], "key": { - "W": { - "item": "minecraft:wheat" - }, "E": { "item": "minecraft:emerald" }, - "I": { - "item": "minecraft:iron_ingot" + "W": { + "item": "minecraft:wheat" + }, + "N": { + "item": "minecraft:iron_nugget" } }, "result": { diff --git a/src/generated/resources/data/totemofreviving/recipes/straw_totem.json b/src/generated/resources/data/totemofreviving/recipes/straw_totem.json index b1fcf7b..3c73d16 100755 --- a/src/generated/resources/data/totemofreviving/recipes/straw_totem.json +++ b/src/generated/resources/data/totemofreviving/recipes/straw_totem.json @@ -1,15 +1,15 @@ { - "type": "minecraft:crafting_shaped", + "type": "totemofreviving:totem_recipe", "pattern": [ "NSN", "NWN", - "N/N" + "N|N" ], "key": { "W": { "item": "minecraft:wheat" }, - "/": { + "|": { "item": "minecraft:stick" }, "S": { diff --git a/src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json b/src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json deleted file mode 100755 index 5a4005d..0000000 --- a/src/generated/resources/data/totemofreviving/recipes/totem_of_reviving.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "@@@", - "@#@", - "@@@" - ], - "key": { - "#": { - "item": "minecraft:totem_of_undying" - }, - "@": { - "item": "minecraft:diamond" - } - }, - "result": { - "item": "totemofreviving:totem_of_reviving" - } -} \ No newline at end of file diff --git a/src/main/java/dev/micle/totemofreviving/ISideProxy.java b/src/main/java/dev/micle/totemofreviving/ISideProxy.java new file mode 100644 index 0000000..9cdc96b --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/ISideProxy.java @@ -0,0 +1,13 @@ +package dev.micle.totemofreviving; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; + +public interface ISideProxy { + MinecraftServer getServer(); + + Player getClientPlayer(); + + ClientLevel getClientWorld(); +} diff --git a/src/main/java/dev/micle/totemofreviving/SideProxy.java b/src/main/java/dev/micle/totemofreviving/SideProxy.java new file mode 100644 index 0000000..511f93f --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/SideProxy.java @@ -0,0 +1,100 @@ +package dev.micle.totemofreviving; + +import dev.micle.totemofreviving.config.Config; +import dev.micle.totemofreviving.data.DataGenerators; +import dev.micle.totemofreviving.network.Network; +import dev.micle.totemofreviving.setup.Registration; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.AddReloadListenerEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.event.lifecycle.*; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.fmlserverevents.FMLServerStartedEvent; +import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent; + +class SideProxy implements ISideProxy { + private static MinecraftServer server = null; + + // Common setup + SideProxy() { + Registration.register(); + Config.init(); + Network.init(); + + IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + modEventBus.addListener(DataGenerators::gatherData); + modEventBus.addListener(SideProxy::setup); + modEventBus.addListener(SideProxy::imcEnqueue); + modEventBus.addListener(SideProxy::imcProcess); + + MinecraftForge.EVENT_BUS.addListener(SideProxy::onAddReloadListeners); + MinecraftForge.EVENT_BUS.addListener(SideProxy::serverStarted); + MinecraftForge.EVENT_BUS.addListener(SideProxy::serverStopping); + } + + private static void setup(FMLCommonSetupEvent event) {} + + private static void imcEnqueue(InterModEnqueueEvent event) {} + + private static void imcProcess(InterModProcessEvent event) {} + + private static void onAddReloadListeners(AddReloadListenerEvent event) {} + + private static void serverStarted(FMLServerStartedEvent event) { + server = event.getServer(); + } + + private static void serverStopping(FMLServerStoppingEvent event) { + server = null; + } + + @Override + public MinecraftServer getServer() { + return server; + } + + @Override + public Player getClientPlayer() { + return null; + } + + @Override + public ClientLevel getClientWorld() { + return null; + } + + // Client setup + static class Client extends SideProxy { + Client() { + FMLJavaModLoadingContext.get().getModEventBus().addListener(Client::setup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(Client::postSetup); + } + + private static void setup(FMLClientSetupEvent event) {} + + private static void postSetup(FMLLoadCompleteEvent event) {} + + @Override + public Player getClientPlayer() { + return Minecraft.getInstance().player; + } + + @Override + public ClientLevel getClientWorld() { + return Minecraft.getInstance().level; + } + } + + // Server setup + static class Server extends SideProxy { + Server() { + FMLJavaModLoadingContext.get().getModEventBus().addListener(Server::setup); + } + + private static void setup(FMLDedicatedServerSetupEvent event) {} + } +} diff --git a/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java b/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java index 9a92b21..67b7210 100755 --- a/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java +++ b/src/main/java/dev/micle/totemofreviving/TotemOfReviving.java @@ -1,53 +1,58 @@ package dev.micle.totemofreviving; -import dev.micle.totemofreviving.network.C2SRequestPlayerRevive; -import dev.micle.totemofreviving.network.C2SRequestTotemCharge; -import dev.micle.totemofreviving.network.C2SRequestTotemTarget; -import dev.micle.totemofreviving.setup.Registration; +import dev.micle.totemofreviving.setup.ModItems; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.players.PlayerList; -import net.minecraftforge.common.MinecraftForge; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.fml.DistExecutor; +import net.minecraftforge.fml.ModContainer; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fmllegacy.network.NetworkRegistry; -import net.minecraftforge.fmllegacy.network.simple.SimpleChannel; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.util.Optional; +import java.util.Random; @Mod(TotemOfReviving.MOD_ID) -public class TotemOfReviving { - public static final String MOD_ID = "totemofreviving"; - public static PlayerList players; - - private static final String PROTOCOL_VERSION = "1"; - public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel( - new ResourceLocation(TotemOfReviving.MOD_ID, "main"), - () -> PROTOCOL_VERSION, - PROTOCOL_VERSION::equals, - PROTOCOL_VERSION::equals - ); +public final class TotemOfReviving { + public static final String MOD_ID = "totemofreviving"; + public static final String MOD_NAME = "Micle's Totem of Reviving"; + public static final CreativeModeTab ITEM_GROUP = new CreativeModeTab(MOD_ID) { + @Override + public ItemStack makeIcon() { + return new ItemStack(ModItems.STRAW_TOTEM.get()); + } + }; + + public static final String RESOURCE_PREFIX = MOD_ID + ':'; + + public static final Random RANDOM = new Random(); + public static final Logger LOGGER = LogManager.getLogger(MOD_NAME); + + public static TotemOfReviving INSTANCE; + public static ISideProxy PROXY; public TotemOfReviving() { - Registration.register(); - - int id = 0; - INSTANCE.registerMessage(id++, - C2SRequestPlayerRevive.class, - C2SRequestPlayerRevive::encode, - C2SRequestPlayerRevive::decode, - C2SRequestPlayerRevive::handle - ); - INSTANCE.registerMessage(id++, - C2SRequestTotemTarget.class, - C2SRequestTotemTarget::encode, - C2SRequestTotemTarget::decode, - C2SRequestTotemTarget::handle - ); - INSTANCE.registerMessage(id++, - C2SRequestTotemCharge.class, - C2SRequestTotemCharge::encode, - C2SRequestTotemCharge::decode, - C2SRequestTotemCharge::handle - ); - - // Register ourselves for server and other game events we are interested in - MinecraftForge.EVENT_BUS.register(this); + INSTANCE = this; + PROXY = DistExecutor.safeRunForDist( + () -> SideProxy.Client::new, + () -> SideProxy.Server::new + ); } + + public static String getVersion() { + Optional optional = ModList.get().getModContainerById(MOD_ID); + if (optional.isPresent()) { + return optional.get().getModInfo().getVersion().toString(); + } + return "0.0.0"; + } + + public static ResourceLocation createResourceLocation(String name) { + if (name.contains(":")) { + throw new IllegalArgumentException("name containes namespace"); + } + return new ResourceLocation(MOD_ID, name); + } } diff --git a/src/main/java/dev/micle/totemofreviving/config/Config.java b/src/main/java/dev/micle/totemofreviving/config/Config.java new file mode 100644 index 0000000..fc0334e --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/config/Config.java @@ -0,0 +1,95 @@ +package dev.micle.totemofreviving.config; + +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 net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.config.ModConfig; + +public final class Config { + public static void init() { + ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, Server.SPEC); + } + + public static class Server { + private static final ForgeConfigSpec SPEC; + + private static final TotemConfig STRAW_TOTEM_CONFIG; + private static final TotemConfig IRON_TOTEM_CONFIG; + private static final TotemConfig DIAMOND_TOTEM_CONFIG; + private static final TotemConfig NETHERITE_TOTEM_CONFIG; + + static { + ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); + + builder.comment("WHEN MAKING CHANGES IT IS RECOMMENDED TO NOT BE IN A WORLD.\n" + + "CHANGES WILL MOST LIKELY REQUIRE A RESTART FOR EVERYTHING TO WORK PROPERLY."); + STRAW_TOTEM_CONFIG = new TotemConfig(builder, StrawTotemItem.getName(), true, -1, 3, + 1, false, false, 1); + IRON_TOTEM_CONFIG = new TotemConfig(builder, IronTotemItem.getName(), true, -1, 5, + 0.75, false, false, 4); + DIAMOND_TOTEM_CONFIG = new TotemConfig(builder, DiamondTotemItem.getName(), true, -1, 10, + 0.5, false, false, 10); + NETHERITE_TOTEM_CONFIG = new TotemConfig(builder, NetheriteTotemItem.getName(), true, 1, 1, + 1, true, true, 0); + + SPEC = builder.build(); + } + + public static TotemConfig getStrawTotemConfig() { return STRAW_TOTEM_CONFIG; } + public static TotemConfig getIronTotemConfig() { return IRON_TOTEM_CONFIG; } + public static TotemConfig getDiamondTotemConfig() { return DIAMOND_TOTEM_CONFIG; } + public static TotemConfig getNetheriteTotemConfig() { return NETHERITE_TOTEM_CONFIG; } + } + + public static class TotemConfig { + private final ForgeConfigSpec.BooleanValue IS_ENABLED; + private final ForgeConfigSpec.IntValue CHARGE_COST; + private final ForgeConfigSpec.IntValue CHARGE_COST_LIMIT; + private final ForgeConfigSpec.DoubleValue CHARGE_COST_MULTIPLIER; + private final ForgeConfigSpec.BooleanValue CAN_REVIVE_MORE_EXPENSIVE_TARGETS; + private final ForgeConfigSpec.BooleanValue CAN_REVIVE_ACROSS_DIMENSIONS; + private final ForgeConfigSpec.IntValue DURABILITY; + + TotemConfig(ForgeConfigSpec.Builder builder, String name, boolean isEnabled, int chargeCost, + int chargeCostLimit, double chargeCostMultiplier, boolean canReviveMoreExpensiveTargets, + boolean canReviveAcrossDimensions, int durability) { + builder.push(name); + IS_ENABLED = builder + .comment("Is the " + name + " enabled?") + .define("isEnabled", isEnabled); + CHARGE_COST = builder + .comment("The charge cost to revive a player.\n" + + "-1 means the cost is dynamic (follows the amount of deaths the target has)\n" + + "Higher values set the charge cost to static, meaning that this will be the amount of charges needed to revive someone.") + .defineInRange("chargeCost", chargeCost, -1, Integer.MAX_VALUE); + CHARGE_COST_LIMIT = builder + .comment("The max amount of charge this totem can hold at once. Only works with dynamic cost.") + .defineInRange("chargeCostLimit", chargeCostLimit, 1, Integer.MAX_VALUE); + CHARGE_COST_MULTIPLIER = builder + .comment("Charge cost multiplier. 0.5 means the charge cost will be 50% of the original cost. Only works with dynamic cost.") + .defineInRange("chargeCostMultiplier", chargeCostMultiplier, 0.01, 100); + CAN_REVIVE_MORE_EXPENSIVE_TARGETS = builder + .comment("Is the totem able to revive targets that cost more than the totems max charge?\n" + + "This only applies if the totem is fully charged. (dynamic wont work if limit is 0)") + .define("canReviveMoreExpensiveTargets", canReviveMoreExpensiveTargets); + CAN_REVIVE_ACROSS_DIMENSIONS = builder + .comment("Is the totem able to revive targets across dimensions?") + .define("canReviveAcrossDimensions", canReviveAcrossDimensions); + DURABILITY = builder + .comment("The durability of the totem. 0 means unbreakable.") + .defineInRange("durability", durability, 0, Integer.MAX_VALUE); + builder.pop(); + } + + public boolean getIsEnabled() { return IS_ENABLED.get(); } + public int getChargeCost() { return CHARGE_COST.get(); } + public int getChargeCostLimit() { return CHARGE_COST_LIMIT.get(); } + public double getChargeCostMultiplier() { return CHARGE_COST_MULTIPLIER.get(); } + public boolean getCanReviveMoreExpensiveTargets() { return CAN_REVIVE_MORE_EXPENSIVE_TARGETS.get(); } + public boolean getCanReviveAcrossDimensions() { return CAN_REVIVE_ACROSS_DIMENSIONS.get(); } + public int getDurability() { return DURABILITY.get(); } + } +} diff --git a/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java b/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java index b048933..59864e3 100755 --- a/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java +++ b/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java @@ -10,15 +10,13 @@ import net.minecraftforge.forge.event.lifecycle.GatherDataEvent; @Mod.EventBusSubscriber(modid = TotemOfReviving.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class DataGenerators { - private DataGenerators() {} - - @SubscribeEvent - public static void gatherData(GatherDataEvent e) { - DataGenerator gen = e.getGenerator(); - ExistingFileHelper existing_file_helper = e.getExistingFileHelper(); - - gen.addProvider(new ModItemModelProvider(gen, existing_file_helper)); - - gen.addProvider(new ModRecipeProvider(gen)); + @SubscribeEvent + public static void gatherData(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + + generator.addProvider(new ModItemModelProvider(generator, existingFileHelper)); + + generator.addProvider(new ModRecipeProvider(generator)); } } diff --git a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java b/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java index 125dfd2..f058f4b 100755 --- a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java +++ b/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java @@ -1,56 +1,99 @@ package dev.micle.totemofreviving.data; +import dev.micle.totemofreviving.item.crafting.ExtendedShapedRecipeBuilder; import dev.micle.totemofreviving.setup.ModItems; +import dev.micle.totemofreviving.setup.ModRecipes; import net.minecraft.data.DataGenerator; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; -import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.world.item.Items; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.function.Consumer; public class ModRecipeProvider extends RecipeProvider { - public ModRecipeProvider(DataGenerator generator_in) { - super(generator_in); + public ModRecipeProvider(DataGenerator generator) { + super(generator); } - + @Override + @ParametersAreNonnullByDefault protected void buildCraftingRecipes(Consumer consumer) { - ShapedRecipeBuilder.shaped(ModItems.TOTEM_OF_REVIVING.get()) - .define('#', Items.TOTEM_OF_UNDYING) - .define('@', Items.DIAMOND) - .pattern("@@@") - .pattern("@#@") - .pattern("@@@") - .unlockedBy("has_item", has(Items.TOTEM_OF_UNDYING)) - .save(consumer); - ShapedRecipeBuilder.shaped(ModItems.REVIVING_CHARGE.get()) - .define('#', Items.TOTEM_OF_UNDYING) - .define('@', Items.DIAMOND_BLOCK) - .define('E', Items.ENDER_PEARL) - .pattern("@E@") - .pattern("E#E") - .pattern("@E@") - .unlockedBy("has_item", has(ModItems.TOTEM_OF_REVIVING.get())) - .save(consumer); - ShapedRecipeBuilder.shaped(ModItems.STRAW_TOTEM.get()) - .define('W', Items.WHEAT) - .define('/', Items.STICK) - .define('S', Items.STRING) - .define('N', Items.IRON_NUGGET) - .pattern("NSN") - .pattern("NWN") - .pattern("N/N") - .unlockedBy("has_item", has(Items.WHEAT)) - .save(consumer); - ShapedRecipeBuilder.shaped(ModItems.STRAW_CHARGE.get()) - .define('W', Items.WHEAT) - .define('E', Items.EMERALD) - .define('I', Items.IRON_INGOT) - .pattern("IWI") - .pattern("WEW") - .pattern("IWI") - .unlockedBy("has_item", has(Items.EMERALD)) - .save(consumer); + ExtendedShapedRecipeBuilder.shaped(ModRecipes.TOTEM_RECIPE.get(), ModItems.STRAW_TOTEM.get()) + .define('W', Items.WHEAT) + .define('|', Items.STICK) + .define('S', Items.STRING) + .define('N', Items.IRON_NUGGET) + .pattern("NSN") + .pattern("NWN") + .pattern("N|N") + .unlockedBy("has_item", has(Items.WHEAT)) + .save(consumer); + ExtendedShapedRecipeBuilder.shaped(ModRecipes.TOTEM_RECIPE.get(), ModItems.IRON_TOTEM.get()) + .define('B', Items.IRON_BLOCK) + .define('E', Items.EMERALD) + .define('I', Items.IRON_INGOT) + .pattern(" E ") + .pattern("IBI") + .pattern(" I ") + .unlockedBy("has_item", has(Items.EMERALD)) + .save(consumer); + ExtendedShapedRecipeBuilder.shaped(ModRecipes.TOTEM_RECIPE.get(), ModItems.DIAMOND_TOTEM.get()) + .define('T', Items.TOTEM_OF_UNDYING) + .define('D', Items.DIAMOND) + .define('E', Items.ENDER_PEARL) + .pattern("EDE") + .pattern("DTD") + .pattern("EDE") + .unlockedBy("has_item", has(Items.TOTEM_OF_UNDYING)) + .save(consumer); + ExtendedShapedRecipeBuilder.shaped(ModRecipes.TOTEM_RECIPE.get(), ModItems.NETHERITE_TOTEM.get()) + .define('T', ModItems.DIAMOND_TOTEM.get()) + .define('N', Items.NETHERITE_SCRAP) + .define('G', Items.GOLD_INGOT) + .define('B', Items.NETHER_BRICK) + .pattern("BNB") + .pattern("NTN") + .pattern("BGB") + .unlockedBy("has_item", has(Items.NETHERITE_SCRAP)) + .save(consumer); + + ExtendedShapedRecipeBuilder.shaped(ModRecipes.CHARGE_RECIPE.get(), ModItems.STRAW_CHARGE.get()) + .define('E', Items.EMERALD) + .define('W', Items.WHEAT) + .define('N', Items.IRON_NUGGET) + .pattern("NWN") + .pattern("WEW") + .pattern("NWN") + .unlockedBy("has_item", has(ModItems.STRAW_TOTEM.get())) + .save(consumer); + ExtendedShapedRecipeBuilder.shaped(ModRecipes.CHARGE_RECIPE.get(), ModItems.IRON_CHARGE.get()) + .define('E', Items.EMERALD) + .define('I', Items.IRON_INGOT) + .define('N', Items.IRON_NUGGET) + .pattern("NIN") + .pattern("IEI") + .pattern("NIN") + .unlockedBy("has_item", has(ModItems.IRON_TOTEM.get())) + .save(consumer); + ExtendedShapedRecipeBuilder.shaped(ModRecipes.TOTEM_RECIPE.get(), ModItems.DIAMOND_CHARGE.get()) + .define('E', Items.EMERALD) + .define('D', Items.DIAMOND) + .define('I', Items.IRON_INGOT) + .define('P', Items.ENDER_PEARL) + .pattern("IDI") + .pattern("PEP") + .pattern("IDI") + .unlockedBy("has_item", has(ModItems.DIAMOND_TOTEM.get())) + .save(consumer); + ExtendedShapedRecipeBuilder.shaped(ModRecipes.CHARGE_RECIPE.get(), ModItems.NETHERITE_CHARGE.get()) + .define('C', ModItems.DIAMOND_CHARGE.get()) + .define('N', Items.NETHERITE_SCRAP) + .define('G', Items.GOLD_INGOT) + .pattern("GNG") + .pattern("NCN") + .pattern("GNG") + .unlockedBy("has_item", has(ModItems.NETHERITE_TOTEM.get())) + .save(consumer); } } diff --git a/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java b/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java index fea2506..e37fa0a 100755 --- a/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java +++ b/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java @@ -1,6 +1,14 @@ package dev.micle.totemofreviving.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 net.minecraft.data.DataGenerator; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; @@ -8,21 +16,26 @@ import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; public class ModItemModelProvider extends ItemModelProvider { - public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existing_file_helper) { - super(generator, TotemOfReviving.MOD_ID, existing_file_helper); + public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator, TotemOfReviving.MOD_ID, existingFileHelper); } @Override protected void registerModels() { - ModelFile item_generated = getExistingFile(mcLoc("item/generated")); + ModelFile itemGenerated = getExistingFile(mcLoc("item/generated")); - builder(item_generated, "totem_of_reviving"); - builder(item_generated, "reviving_charge"); - builder(item_generated, "straw_totem"); - builder(item_generated, "straw_charge"); + builder(itemGenerated, StrawTotemItem.getName()); + builder(itemGenerated, IronTotemItem.getName()); + builder(itemGenerated, DiamondTotemItem.getName()); + builder(itemGenerated, NetheriteTotemItem.getName()); + + builder(itemGenerated, StrawChargeItem.getName()); + builder(itemGenerated, IronChargeItem.getName()); + builder(itemGenerated, DiamondChargeItem.getName()); + builder(itemGenerated, NetheriteChargeItem.getName()); } - private ItemModelBuilder builder(ModelFile item_generated, String name) { - return getBuilder(name).parent(item_generated).texture("layer0", "item/" + name); + private ItemModelBuilder builder(ModelFile itemGenerated, String name) { + return getBuilder(name).parent(itemGenerated).texture("layer0", "item/" + name); } } diff --git a/src/main/java/dev/micle/totemofreviving/events/ServerTickEventHandler.java b/src/main/java/dev/micle/totemofreviving/events/ServerTickEventHandler.java deleted file mode 100755 index 05c82c1..0000000 --- a/src/main/java/dev/micle/totemofreviving/events/ServerTickEventHandler.java +++ /dev/null @@ -1,13 +0,0 @@ -package dev.micle.totemofreviving.events; - -import dev.micle.totemofreviving.TotemOfReviving; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fmllegacy.server.ServerLifecycleHooks; - -public class ServerTickEventHandler { - @SubscribeEvent - public void onServerTick(TickEvent.ServerTickEvent event) { - TotemOfReviving.players = ServerLifecycleHooks.getCurrentServer().getPlayerList(); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java new file mode 100644 index 0000000..6bf12f3 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/charge/ChargeItem.java @@ -0,0 +1,49 @@ +package dev.micle.totemofreviving.item.charge; + +import dev.micle.totemofreviving.TotemOfReviving; +import dev.micle.totemofreviving.config.Config; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; + +public class ChargeItem extends Item { + public ChargeItem() { + this(Rarity.COMMON); + } + + public ChargeItem(Rarity rarity) { + super(new Item.Properties().tab(TotemOfReviving.ITEM_GROUP).stacksTo(64).rarity(rarity)); + } + + @Override + @OnlyIn(Dist.CLIENT) + @ParametersAreNonnullByDefault + public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag tooltipFlag) { + if (isEnabled(stack)) { + tooltip.add(new TextComponent(ChatFormatting.WHITE + "Used for charging its corresponding totem.")); + } else { + tooltip.add(new TextComponent(ChatFormatting.RED + "Totem is disabled!")); + } + super.appendHoverText(stack, world, tooltip, tooltipFlag); + } + + public static boolean isEnabled(ItemStack stack) { + Item item = stack.getItem(); + if (item instanceof StrawChargeItem) { return Config.Server.getStrawTotemConfig().getIsEnabled(); } + if (item instanceof IronChargeItem) { return Config.Server.getIronTotemConfig().getIsEnabled(); } + if (item instanceof DiamondChargeItem) { return Config.Server.getDiamondTotemConfig().getIsEnabled(); } + if (item instanceof NetheriteChargeItem) { return Config.Server.getNetheriteTotemConfig().getIsEnabled(); } + return false; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java new file mode 100644 index 0000000..348ea84 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/charge/DiamondChargeItem.java @@ -0,0 +1,13 @@ +package dev.micle.totemofreviving.item.charge; + +import net.minecraft.world.item.Rarity; + +public class DiamondChargeItem extends ChargeItem { + public DiamondChargeItem() { + super(Rarity.RARE); + } + + public static String getName() { + return "diamond_charge"; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java new file mode 100644 index 0000000..c9f0443 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/charge/IronChargeItem.java @@ -0,0 +1,9 @@ +package dev.micle.totemofreviving.item.charge; + +public class IronChargeItem extends ChargeItem { + public IronChargeItem() {} + + public static String getName() { + return "iron_charge"; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java new file mode 100644 index 0000000..2795e51 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/charge/NetheriteChargeItem.java @@ -0,0 +1,13 @@ +package dev.micle.totemofreviving.item.charge; + +import net.minecraft.world.item.Rarity; + +public class NetheriteChargeItem extends ChargeItem { + public NetheriteChargeItem() { + super(Rarity.EPIC); + } + + public static String getName() { + return "netherite_charge"; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java b/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java new file mode 100644 index 0000000..534a8f4 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/charge/StrawChargeItem.java @@ -0,0 +1,13 @@ +package dev.micle.totemofreviving.item.charge; + +import net.minecraft.world.item.Rarity; + +public class StrawChargeItem extends ChargeItem { + public StrawChargeItem() { + super(Rarity.UNCOMMON); + } + + public static String getName() { + return "straw_charge"; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/crafting/ChargeRecipe.java b/src/main/java/dev/micle/totemofreviving/item/crafting/ChargeRecipe.java new file mode 100644 index 0000000..70f601d --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/crafting/ChargeRecipe.java @@ -0,0 +1,33 @@ +package dev.micle.totemofreviving.item.crafting; + +import dev.micle.totemofreviving.item.charge.ChargeItem; +import dev.micle.totemofreviving.setup.ModRecipes; +import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.ShapedRecipe; +import net.minecraft.world.level.Level; + +public class ChargeRecipe extends ExtendedShapedRecipe { + public ChargeRecipe(ShapedRecipe recipe) { + super(recipe); + } + + @Override + public RecipeSerializer getSerializer() { + return ModRecipes.CHARGE_RECIPE.get(); + } + + @Override + public boolean matches(CraftingContainer inventory, Level world) { + if (!ChargeItem.isEnabled(getResultItem())) { + return false; + } + return getBaseRecipe().matches(inventory, world); + } + + @Override + public ItemStack assemble(CraftingContainer inventory) { + return getBaseRecipe().getResultItem(); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipe.java b/src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipe.java new file mode 100644 index 0000000..9b5ed65 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipe.java @@ -0,0 +1,88 @@ +package dev.micle.totemofreviving.item.crafting; + +import com.google.gson.JsonObject; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.ShapedRecipe; +import net.minecraft.world.level.Level; +import net.minecraftforge.registries.ForgeRegistryEntry; + +import javax.annotation.Nullable; +import java.util.function.BiConsumer; +import java.util.function.Function; + +public abstract class ExtendedShapedRecipe extends ShapedRecipe { + private static final RecipeSerializer BASE_SERIALIZER = RecipeSerializer.SHAPED_RECIPE; + + private final ShapedRecipe recipe; + + public ExtendedShapedRecipe(ShapedRecipe recipe) { + super(recipe.getId(), recipe.getGroup(), recipe.getRecipeWidth(), recipe.getRecipeHeight(), recipe.getIngredients(), recipe.getResultItem()); + this.recipe = recipe; + } + + public ShapedRecipe getBaseRecipe() { + return this.recipe; + } + + @Override + public abstract RecipeSerializer getSerializer(); + + @Override + public abstract boolean matches(CraftingContainer inventory, Level world); + + @Override + public abstract ItemStack assemble(CraftingContainer inventory); + + public static class Serializer extends ForgeRegistryEntry> implements RecipeSerializer { + private final Function recipeFactory; + @Nullable private final BiConsumer readJson; + @Nullable private final BiConsumer readBuffer; + @Nullable private final BiConsumer writeBuffer; + + public Serializer(Function recipeFactory, + @Nullable BiConsumer readJson, + @Nullable BiConsumer readBuffer, + @Nullable BiConsumer writeBuffer) { + this.recipeFactory = recipeFactory; + this.readJson = readJson; + this.readBuffer = readBuffer; + this.writeBuffer = writeBuffer; + } + + public static Serializer basic(Function recipeFactory) { + return new Serializer<>(recipeFactory, null, null, null); + } + + @Override + public T fromJson(ResourceLocation recipeId, JsonObject json) { + ShapedRecipe recipe = BASE_SERIALIZER.fromJson(recipeId, json); + T result = this.recipeFactory.apply(recipe); + if (this.readJson != null) { + this.readJson.accept(json, result); + } + return result; + } + + @Override + public T fromNetwork(ResourceLocation recipeId, FriendlyByteBuf buffer) { + ShapedRecipe recipe = BASE_SERIALIZER.fromNetwork(recipeId, buffer); + T result = this.recipeFactory.apply(recipe); + if (this.readBuffer != null) { + this.readBuffer.accept(buffer, result); + } + return result; + } + + @Override + public void toNetwork(FriendlyByteBuf buffer, T recipe) { + BASE_SERIALIZER.toNetwork(buffer, recipe.getBaseRecipe()); + if (this.writeBuffer != null) { + this.writeBuffer.accept(buffer, recipe); + } + } + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipeBuilder.java b/src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipeBuilder.java new file mode 100644 index 0000000..b94bb56 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/crafting/ExtendedShapedRecipeBuilder.java @@ -0,0 +1,184 @@ +package dev.micle.totemofreviving.item.crafting; + +import com.google.common.collect.Sets; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementRewards; +import net.minecraft.advancements.CriterionTriggerInstance; +import net.minecraft.advancements.RequirementsStrategy; +import net.minecraft.advancements.critereon.EntityPredicate; +import net.minecraft.advancements.critereon.RecipeUnlockedTrigger; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.Tag; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.level.ItemLike; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Consumer; + +public class ExtendedShapedRecipeBuilder { + private final RecipeSerializer serializer; + private final Item result; + private final int count; + private final List pattern = new ArrayList<>(); + private final Map key = new LinkedHashMap<>(); + private final Advancement.Builder advancementBuilder = Advancement.Builder.advancement(); + private boolean hasAdvancementCriterion = false; + private String group = ""; + + private ExtendedShapedRecipeBuilder(RecipeSerializer serializer, ItemLike result, int count) { + this.serializer = serializer; + this.result = result.asItem(); + this.count = count; + } + + public static ExtendedShapedRecipeBuilder shaped(RecipeSerializer serializer, ItemLike result) { + return shaped(serializer, result, 1); + } + + public static ExtendedShapedRecipeBuilder shaped(RecipeSerializer serializer, ItemLike result, int count) { + return new ExtendedShapedRecipeBuilder(serializer, result, count); + } + + public ExtendedShapedRecipeBuilder define(Character symbol, Tag tagIn) { + return this.define(symbol, Ingredient.of(tagIn)); + } + + public ExtendedShapedRecipeBuilder define(Character symbol, ItemLike itemIn) { + return this.define(symbol, Ingredient.of(itemIn)); + } + + public ExtendedShapedRecipeBuilder define(Character symbol, Ingredient ingredientIn) { + if (this.key.containsKey(symbol)) { + throw new IllegalArgumentException("Symbol '" + symbol + "' is already defined!"); + } else if (symbol == ' ') { + throw new IllegalArgumentException("Symbol ' ' (whitespace) is reserved and cannot be defined"); + } else { + this.key.put(symbol, ingredientIn); + return this; + } + } + + public ExtendedShapedRecipeBuilder pattern(String patternIn) { + if (!this.pattern.isEmpty() && patternIn.length() != this.pattern.get(0).length()) { + throw new IllegalArgumentException("Pattern must be the same width on every line!"); + } else { + this.pattern.add(patternIn); + return this; + } + } + + public ExtendedShapedRecipeBuilder unlockedBy(String name, CriterionTriggerInstance criterionIn) { + this.advancementBuilder.addCriterion(name, criterionIn); + this.hasAdvancementCriterion = true; + return this; + } + + public ExtendedShapedRecipeBuilder group(String groupIn) { + this.group = groupIn; + return this; + } + + public void save(Consumer consumer) { + save(consumer, this.result.getRegistryName()); + } + + public void save(Consumer consumer, ResourceLocation id) { + this.validate(id); + if (this.hasAdvancementCriterion && !this.advancementBuilder.getCriteria().isEmpty()) { + this.advancementBuilder.parent(new ResourceLocation("recipes/root")) + .addCriterion("has_the_recipe", new RecipeUnlockedTrigger.TriggerInstance(EntityPredicate.Composite.ANY, id)) + .rewards(AdvancementRewards.Builder.recipe(id)) + .requirements(RequirementsStrategy.OR); + } + ResourceLocation advancementId = new ResourceLocation(id.getNamespace(), "recipes/" + this.result.getItemCategory().getRecipeFolderName() + "/" + id.getPath()); + consumer.accept(new Result(id, this, advancementId)); + } + + private void validate(ResourceLocation id) { + if (this.pattern.isEmpty()) { + throw new IllegalStateException("No pattern is defined for shaped recipe " + id + "!"); + } else { + Set set = Sets.newHashSet(this.key.keySet()); + set.remove(' '); + + for (String s : this.pattern) { + for (int i = 0; i < s.length(); ++i) { + char c0 = s.charAt(i); + if (!this.key.containsKey(c0) && c0 != ' ') { + throw new IllegalStateException("Pattern in recipe " + id + " uses undefined symbol '" + c0 + "'"); + } + + set.remove(c0); + } + } + + if (!set.isEmpty()) { + throw new IllegalStateException("Ingredients are defined but not used in pattern for recipe " + id); + } else if (this.pattern.size() == 1 && this.pattern.get(0).length() == 1) { + throw new IllegalStateException("Shaped recipe " + id + " only takes in a single item - should it be a shapeless recipe instead?"); + } + } + } + + public static class Result implements FinishedRecipe { + private final ResourceLocation id; + private final ExtendedShapedRecipeBuilder builder; + private final ResourceLocation advancementId; + + public Result(ResourceLocation id, ExtendedShapedRecipeBuilder builder, ResourceLocation advancementId) { + this.id = id; + this.builder = builder; + this.advancementId = advancementId; + } + + @Override + public void serializeRecipeData(JsonObject json) { + if (!builder.group.isEmpty()) { + json.addProperty("group", builder.group); + } + + JsonArray pattern = new JsonArray(); + builder.pattern.forEach(pattern::add); + json.add("pattern", pattern); + + JsonObject key = new JsonObject(); + builder.key.forEach((c, ingredient) -> key.add(String.valueOf(c), ingredient.toJson())); + json.add("key", key); + + JsonObject result = new JsonObject(); + result.addProperty("item", builder.result.getRegistryName().toString()); + if (builder.count > 1) { + result.addProperty("count", builder.count); + } + json.add("result", result); + } + + @Override + public RecipeSerializer getType() { + return builder.serializer; + } + + @Override + public ResourceLocation getId() { + return id; + } + + @Nullable + @Override + public JsonObject serializeAdvancement() { + return builder.hasAdvancementCriterion ? builder.advancementBuilder.serializeToJson() : null; + } + + @Nullable + @Override + public ResourceLocation getAdvancementId() { + return builder.hasAdvancementCriterion ? advancementId : null; + } + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/crafting/TotemRecipe.java b/src/main/java/dev/micle/totemofreviving/item/crafting/TotemRecipe.java new file mode 100644 index 0000000..15322be --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/crafting/TotemRecipe.java @@ -0,0 +1,33 @@ +package dev.micle.totemofreviving.item.crafting; + +import dev.micle.totemofreviving.item.totem.TotemItem; +import dev.micle.totemofreviving.setup.ModRecipes; +import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.ShapedRecipe; +import net.minecraft.world.level.Level; + +public class TotemRecipe extends ExtendedShapedRecipe { + public TotemRecipe(ShapedRecipe recipe) { + super(recipe); + } + + @Override + public RecipeSerializer getSerializer() { + return ModRecipes.TOTEM_RECIPE.get(); + } + + @Override + public boolean matches(CraftingContainer inventory, Level world) { + if (!TotemItem.isEnabled(getResultItem())) { + return false; + } + return getBaseRecipe().matches(inventory, world); + } + + @Override + public ItemStack assemble(CraftingContainer inventory) { + return getBaseRecipe().getResultItem(); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java new file mode 100644 index 0000000..72d9544 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/totem/DiamondTotemItem.java @@ -0,0 +1,21 @@ +package dev.micle.totemofreviving.item.totem; + +import dev.micle.totemofreviving.config.Config; +import dev.micle.totemofreviving.item.charge.DiamondChargeItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; + +public class DiamondTotemItem extends TotemItem { + public DiamondTotemItem() { + super(Rarity.RARE, Config.Server.getDiamondTotemConfig().getDurability()); + } + + public static String getName() { + return "diamond_totem"; + } + + @Override + public boolean isCharge(ItemStack stack) { + return (stack.getItem() instanceof DiamondChargeItem); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java new file mode 100644 index 0000000..74da722 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/totem/IronTotemItem.java @@ -0,0 +1,20 @@ +package dev.micle.totemofreviving.item.totem; + +import dev.micle.totemofreviving.config.Config; +import dev.micle.totemofreviving.item.charge.IronChargeItem; +import net.minecraft.world.item.ItemStack; + +public class IronTotemItem extends TotemItem { + public IronTotemItem() { + super(Config.Server.getIronTotemConfig().getDurability()); + } + + public static String getName() { + return "iron_totem"; + } + + @Override + public boolean isCharge(ItemStack stack) { + return (stack.getItem() instanceof IronChargeItem); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java new file mode 100644 index 0000000..6718373 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/totem/NetheriteTotemItem.java @@ -0,0 +1,26 @@ +package dev.micle.totemofreviving.item.totem; + +import dev.micle.totemofreviving.config.Config; +import dev.micle.totemofreviving.item.charge.NetheriteChargeItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; + +public class NetheriteTotemItem extends TotemItem { + public NetheriteTotemItem() { + super(Rarity.EPIC, Config.Server.getNetheriteTotemConfig().getDurability()); + } + + public static String getName() { + return "netherite_totem"; + } + + @Override + public boolean isCharge(ItemStack stack) { + return (stack.getItem() instanceof NetheriteChargeItem); + } + + @Override + public boolean isFireResistant() { + return true; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java new file mode 100644 index 0000000..d15f834 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/totem/StrawTotemItem.java @@ -0,0 +1,21 @@ +package dev.micle.totemofreviving.item.totem; + +import dev.micle.totemofreviving.config.Config; +import dev.micle.totemofreviving.item.charge.StrawChargeItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; + +public class StrawTotemItem extends TotemItem { + public StrawTotemItem() { + super(Rarity.UNCOMMON, Config.Server.getStrawTotemConfig().getDurability()); + } + + public static String getName() { + return "straw_totem"; + } + + @Override + public boolean isCharge(ItemStack stack) { + return (stack.getItem() instanceof StrawChargeItem); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java b/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java new file mode 100644 index 0000000..2cbf2ff --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/item/totem/TotemItem.java @@ -0,0 +1,259 @@ +package dev.micle.totemofreviving.item.totem; + +import dev.micle.totemofreviving.TotemOfReviving; +import dev.micle.totemofreviving.config.Config; +import dev.micle.totemofreviving.network.ChangeTargetPacket; +import dev.micle.totemofreviving.network.ChargeTotemPacket; +import dev.micle.totemofreviving.network.Network; +import dev.micle.totemofreviving.network.ReviveTargetPacket; +import dev.micle.totemofreviving.setup.ModKeyMappings; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.stats.Stats; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + +import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; +import java.util.UUID; + +public abstract class TotemItem extends Item { + private static final String TAG_TARGET_INDEX = "target_index"; + private static final String TAG_TARGET_UUID = "target_uuid"; + private static final String TAG_TARGET_NAME = "target_name"; + private static final String TAG_TARGET_DEATHS = "target_deaths"; + private static final String TAG_CHARGE = "charge"; + + public TotemItem(int durability) { + this(Rarity.COMMON, durability); + } + + public TotemItem(Rarity rarity, int durability) { + super(new Item.Properties().tab(TotemOfReviving.ITEM_GROUP).stacksTo(1).rarity(rarity).defaultDurability(durability)); + } + + public abstract boolean isCharge(ItemStack stack); + + public static int getTargetIndex(ItemStack stack) { + if (!isTotem(stack)) { return -1; } + return stack.getOrCreateTag().getInt(TAG_TARGET_INDEX); + } + public static void setTargetIndex(ItemStack stack, int targetIndex) { + if (!isTotem(stack)) { return; } + stack.getOrCreateTag().putInt(TAG_TARGET_INDEX, targetIndex); + } + + public static UUID getTargetUUID(ItemStack stack) { + if (!isTotem(stack)) { return null; } + try { + return UUID.fromString(stack.getOrCreateTag().getString(TAG_TARGET_UUID)); + } catch (IllegalArgumentException exception) { + return null; + } + } + public static void setTargetUUID(ItemStack stack, UUID targetUUID) { + if (!isTotem(stack)) { return; } + stack.getOrCreateTag().putString(TAG_TARGET_UUID, targetUUID.toString()); + } + + public static String getTargetName(ItemStack stack) { + if (!isTotem(stack)) { return null; } + return stack.getOrCreateTag().getString(TAG_TARGET_NAME); + } + public static void setTargetName(ItemStack stack, String targetName) { + if (!isTotem(stack)) { return; } + stack.getOrCreateTag().putString(TAG_TARGET_NAME, targetName); + } + + public static int getTargetCost(ItemStack stack) { + if (!isTotem(stack)) { return -1; } + return !isCostDynamic(stack) ? getConfig(stack).getChargeCost() : + (int)(getTargetDeaths(stack) * getConfig(stack).getChargeCostMultiplier()); + } + + public static int getTargetDeaths(ItemStack stack) { + if (!isTotem(stack)) { return -1; } + return stack.getOrCreateTag().getInt(TAG_TARGET_DEATHS); + } + public static void setTargetDeaths(ItemStack stack, ServerPlayer target) { + if (!isTotem(stack)) { return; } + stack.getOrCreateTag().putInt(TAG_TARGET_DEATHS, target.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS))); + } + + public static boolean isTotemFull(ItemStack stack) { + if (!isTotem(stack)) { return false; } + return getCharge(stack) == getMaxCharge(stack); + } + + public static boolean canTotemAffordTarget(ItemStack stack) { + if (!isTotem(stack)) { return false; } + if (getCharge(stack) < getTargetCost(stack)) { + if (!isTotemFull(stack)) { + return false; + } + return isTotemFull(stack) && canReviveMoreExpensiveTargets(stack); + } + return true; + } + + public static int getCharge(ItemStack stack) { + if (!isTotem(stack)) { return -1; } + int charge = stack.getOrCreateTag().getInt(TAG_CHARGE); + int maxCharge = getMaxCharge(stack); + if (charge > maxCharge) { + charge = maxCharge; + setCharge(stack, charge); + } + return charge; + } + public static void setCharge(ItemStack stack, int charge) { + if (!isTotem(stack)) { return; } + stack.getOrCreateTag().putInt(TAG_CHARGE, charge); + } + + public static int getMaxCharge(ItemStack stack) { + Config.TotemConfig config = getConfig(stack); + if (config == null) { return -1; } + + if (config.getChargeCost() == -1) { + return config.getChargeCostLimit(); + } + return config.getChargeCost(); + } + + public static boolean isCostDynamic(ItemStack stack) { + if (!isTotem(stack)) { return false; } + return getConfig(stack).getChargeCost() == -1; + } + + public static boolean canReviveAcrossDimensions(ItemStack stack) { + if (!isTotem(stack)) { return false; } + return getConfig(stack).getCanReviveAcrossDimensions(); + } + + public static boolean canReviveMoreExpensiveTargets(ItemStack stack) { + if (!isTotem(stack)) { return false; } + return getConfig(stack).getCanReviveMoreExpensiveTargets(); + } + + public static boolean isEnabled(ItemStack stack) { + if (!isTotem(stack)) { return false; } + return getConfig(stack).getIsEnabled(); + } + + @Override + @OnlyIn(Dist.CLIENT) + @ParametersAreNonnullByDefault + public void appendHoverText(ItemStack stack, @Nullable Level world, List tooltip, TooltipFlag tooltipFlag) { + if (world == null) { return; } + + UUID targetUUID = getTargetUUID(stack); + String targetName = getTargetName(stack); + int targetCost = getTargetCost(stack); + int charge = getCharge(stack); + int maxCharge = getMaxCharge(stack); + double multiplier = getConfig(stack).getChargeCostMultiplier(); + + if (getConfig(stack).getIsEnabled()) { + if (targetUUID == null) { + tooltip.add(new TextComponent(ChatFormatting.RED + "Target: " + ChatFormatting.DARK_RED + "NONE")); + } else { + tooltip.add(new TextComponent(ChatFormatting.WHITE + "Target: " + ChatFormatting.GRAY + targetName)); + } + tooltip.add(new TextComponent("")); + if (!canTotemAffordTarget(stack)) { + tooltip.add(new TextComponent(ChatFormatting.RED + "Charges: " + ChatFormatting.DARK_RED + "(" + charge + "/" + targetCost + ") " + + ChatFormatting.RED + "[Max: " + ChatFormatting.DARK_RED + maxCharge + ChatFormatting.RED + "] [Multi: " + ChatFormatting.DARK_RED + multiplier + ChatFormatting.RED + "]")); + } else { + tooltip.add(new TextComponent(ChatFormatting.WHITE + "Charges: " + ChatFormatting.GRAY + "(" + charge + "/" + targetCost + ") " + + ChatFormatting.WHITE + "[Max: " + ChatFormatting.GRAY + maxCharge + ChatFormatting.WHITE + "] [Multi: " + ChatFormatting.GRAY + multiplier + ChatFormatting.WHITE + "]")); + } + if (canReviveMoreExpensiveTargets(stack)) { + tooltip.add(new TextComponent(ChatFormatting.WHITE + "Can revive more expensive targets.")); + } + if (canReviveAcrossDimensions(stack)) { + tooltip.add(new TextComponent(ChatFormatting.WHITE + "Can revive targets across dimensions.")); + } + tooltip.add(new TextComponent("")); + if (ModKeyMappings.ADVANCED_TOOLTIP.isDown()) { + tooltip.add(new TextComponent(ChatFormatting.GRAY + "Showing advanced tooltip.")); + tooltip.add(new TextComponent(ChatFormatting.WHITE + "[" + ChatFormatting.GRAY + "R-CLICK" + ChatFormatting.WHITE + "]")); + tooltip.add(new TextComponent(ChatFormatting.WHITE + "When second hand is empty: revive target.")); + tooltip.add(new TextComponent(ChatFormatting.WHITE + "When second hand is holding a reviving charge: charge totem.")); + tooltip.add(new TextComponent("")); + tooltip.add(new TextComponent(ChatFormatting.WHITE + "[" + ChatFormatting.GRAY + "L-SHIFT + R-CLICK" + ChatFormatting.WHITE + "]")); + tooltip.add(new TextComponent(ChatFormatting.WHITE + "Change target.")); + } else { + tooltip.add(new TextComponent(ChatFormatting.GRAY + "Hold [" + ChatFormatting.DARK_GRAY + "L-SHIFT" + ChatFormatting.GRAY + "] for advanced tooltip.")); + } + } else { + tooltip.add(new TextComponent(ChatFormatting.RED + "Totem is disabled!")); + } + super.appendHoverText(stack, world, tooltip, tooltipFlag); + } + + @Override + @OnlyIn(Dist.CLIENT) + @ParametersAreNonnullByDefault + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { + if (!getConfig(player.getItemInHand(hand)).getIsEnabled() || !world.isClientSide) { + return super.use(world, player, hand); + } + + ItemStack chargeItem = (hand.equals(InteractionHand.MAIN_HAND)) ? player.getOffhandItem() : player.getMainHandItem(); + + if (player.isCrouching()) { + Network.channel.sendToServer(new ChangeTargetPacket(hand)); + } else { + if (isCharge(chargeItem)) { + Network.channel.sendToServer(new ChargeTotemPacket(hand)); + } else { + Network.channel.sendToServer(new ReviveTargetPacket(hand)); + } + } + return super.use(world, player, hand); + } + + @Override + public int getMaxDamage(ItemStack stack) { + return getConfig(stack).getDurability(); + } + + @Override + public boolean isDamageable(ItemStack stack) { + return (getConfig(stack).getDurability() != 0); + } + + @Override + public int getDamage(ItemStack stack) { + if (isDamageable(stack) && super.getDamage(stack) >= getMaxDamage(stack)) { + stack.setCount(0); + return getMaxDamage(stack); + } + return (isDamageable(stack)) ? super.getDamage(stack) : 0; + } + + private static boolean isTotem(ItemStack stack) { + return (stack.getItem() instanceof TotemItem); + } + + private static Config.TotemConfig getConfig(ItemStack stack) { + Item item = stack.getItem(); + if (item instanceof StrawTotemItem) { return Config.Server.getStrawTotemConfig(); } + if (item instanceof IronTotemItem) { return Config.Server.getIronTotemConfig(); } + if (item instanceof DiamondTotemItem) { return Config.Server.getDiamondTotemConfig(); } + if (item instanceof NetheriteTotemItem) { return Config.Server.getNetheriteTotemConfig(); } + return null; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java b/src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java deleted file mode 100755 index 5369ac1..0000000 --- a/src/main/java/dev/micle/totemofreviving/items/RevivingChargeItem.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.micle.totemofreviving.items; - -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; - -public class RevivingChargeItem extends Item { - public RevivingChargeItem() { - super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.RARE)); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java b/src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java deleted file mode 100755 index 6177083..0000000 --- a/src/main/java/dev/micle/totemofreviving/items/StrawChargeItem.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.micle.totemofreviving.items; - -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Rarity; - -public class StrawChargeItem extends Item { - public StrawChargeItem() { - super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).rarity(Rarity.UNCOMMON)); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java b/src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java deleted file mode 100755 index 7cd1060..0000000 --- a/src/main/java/dev/micle/totemofreviving/items/StrawTotemItem.java +++ /dev/null @@ -1,81 +0,0 @@ -package dev.micle.totemofreviving.items; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.network.C2SRequestPlayerRevive; -import dev.micle.totemofreviving.network.C2SRequestTotemCharge; -import dev.micle.totemofreviving.network.C2SRequestTotemTarget; -import dev.micle.totemofreviving.setup.ModKeyMappings; -import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.*; -import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import java.util.List; - -public class StrawTotemItem extends Item { - public static final String TAG_CHARGE_AMOUNT = "charge"; - public static final String TAG_TARGET_INDEX = "target_index"; - public static final String TAG_TARGET_NAME = "target_name"; - public static final String TAG_FAIL_CHANCE = "fail_chance"; - public static final int STARTING_FAIL_CHANCE = 45; - - public StrawTotemItem() { - super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.UNCOMMON)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack stack, Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); - tooltip.add(new TextComponent(ChatFormatting.GOLD + "Charges: " + ChatFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT))); - tooltip.add(new TextComponent(ChatFormatting.GOLD + "Target: " + ChatFormatting.GRAY + stack.getOrCreateTag().getString(TAG_TARGET_NAME))); - tooltip.add(new TextComponent(ChatFormatting.GOLD + "Fail Chance: " + ChatFormatting.GRAY + stack.getOrCreateTag().getInt(TAG_FAIL_CHANCE))); - tooltip.add(new TextComponent( ChatFormatting.DARK_GRAY + "" + ChatFormatting.ITALIC + "\"Feels kinda funky.\"")); - tooltip.add(new TextComponent("")); - if (ModKeyMappings.KEYMAP_UI_LSHIFT.isDown()) { - tooltip.add(new TextComponent(ChatFormatting.YELLOW + "R-CLICK")); - tooltip.add(new TextComponent(ChatFormatting.GOLD + "When other hand is empty: attempt to revive target.")); - tooltip.add(new TextComponent(ChatFormatting.GOLD + "When other hand has " + ChatFormatting.GRAY + "Straw Reviving Charge" + ChatFormatting.GOLD + ": charge totem.")); - tooltip.add(new TextComponent("")); - tooltip.add(new TextComponent(ChatFormatting.YELLOW + "SHIFT R-CLICK")); - tooltip.add(new TextComponent(ChatFormatting.GOLD + "Cycle through available targets.")); - } else { - tooltip.add(new TextComponent(ChatFormatting.GRAY + "[" + ChatFormatting.WHITE + "LSHIFT" + ChatFormatting.GRAY + "] for advanced tooltip.")); - } - } - - @Override - public void onCraftedBy(ItemStack stack, Level world, Player player) { - super.onCraftedBy(stack, world, player); - stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0); - stack.getOrCreateTag().putInt(TAG_FAIL_CHANCE, STARTING_FAIL_CHANCE); - } - - @Override - @OnlyIn(Dist.CLIENT) - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { - if (!world.isClientSide) { return super.use(world, player, hand); } - if (player.isCrouching()) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand)); - } else { - InteractionHand item_charge_hand = InteractionHand.MAIN_HAND; - if (hand.equals(InteractionHand.MAIN_HAND)) { - item_charge_hand = InteractionHand.OFF_HAND; - } - Item item_charge = player.getItemInHand(item_charge_hand).getItem(); - - if (item_charge instanceof StrawChargeItem) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand)); - } else { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand)); - } - } - return super.use(world, player, hand); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java b/src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java deleted file mode 100755 index d906620..0000000 --- a/src/main/java/dev/micle/totemofreviving/items/TotemOfRevivingItem.java +++ /dev/null @@ -1,77 +0,0 @@ -package dev.micle.totemofreviving.items; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.network.C2SRequestPlayerRevive; -import dev.micle.totemofreviving.network.C2SRequestTotemCharge; -import dev.micle.totemofreviving.network.C2SRequestTotemTarget; -import dev.micle.totemofreviving.setup.ModKeyMappings; -import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.*; -import net.minecraft.world.level.Level; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import java.util.List; - -public class TotemOfRevivingItem extends Item { - public static final String TAG_CHARGE_AMOUNT = "charge"; - public static final String TAG_TARGET_INDEX = "target_index"; - public static final String TAG_TARGET_NAME = "target_name"; - - public TotemOfRevivingItem() { - super(new Item.Properties().tab(CreativeModeTab.TAB_MISC).stacksTo(1).rarity(Rarity.RARE)); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void appendHoverText(ItemStack stack, Level world, List tooltip, TooltipFlag flag) { - super.appendHoverText(stack, world, tooltip, flag); - tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Charges: " + ChatFormatting.BLUE + stack.getOrCreateTag().getInt(TAG_CHARGE_AMOUNT)) { - }); - tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Target: " + ChatFormatting.BLUE + stack.getOrCreateTag().getString(TAG_TARGET_NAME))); - tooltip.add(new TextComponent("")); - if (ModKeyMappings.KEYMAP_UI_LSHIFT.isDown()) { - tooltip.add(new TextComponent(ChatFormatting.AQUA + "R-CLICK")); - tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "When other hand is empty: attempt to revive target.")); - tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "When other hand has " + ChatFormatting.BLUE + "Reviving Charge" + ChatFormatting.DARK_AQUA + ": charge totem.")); - tooltip.add(new TextComponent("")); - tooltip.add(new TextComponent(ChatFormatting.AQUA + "SHIFT R-CLICK")); - tooltip.add(new TextComponent(ChatFormatting.DARK_AQUA + "Cycle through available targets.")); - } else { - tooltip.add(new TextComponent(ChatFormatting.GRAY + "[" + ChatFormatting.WHITE + "LSHIFT" + ChatFormatting.GRAY + "] for advanced tooltip.")); - } - } - - @Override - public void onCraftedBy(ItemStack stack, Level world, Player player) { - super.onCraftedBy(stack, world, player); - stack.getOrCreateTag().putInt(TAG_CHARGE_AMOUNT, 0); - } - - @Override - @OnlyIn(Dist.CLIENT) - public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { - if (!world.isClientSide) { return super.use(world, player, hand); } - if (player.isCrouching()) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemTarget(player.getUUID(), hand)); - } else { - InteractionHand item_charge_hand = InteractionHand.MAIN_HAND; - if (hand.equals(InteractionHand.MAIN_HAND)) { - item_charge_hand = InteractionHand.OFF_HAND; - } - Item item_charge = player.getItemInHand(item_charge_hand).getItem(); - - if (item_charge instanceof RevivingChargeItem) { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestTotemCharge(player.getUUID(), hand, item_charge_hand)); - } else { - TotemOfReviving.INSTANCE.sendToServer(new C2SRequestPlayerRevive(player.getUUID(), hand)); - } - } - return super.use(world, player, hand); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java b/src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java deleted file mode 100755 index fdbcd65..0000000 --- a/src/main/java/dev/micle/totemofreviving/network/C2SRequestPlayerRevive.java +++ /dev/null @@ -1,86 +0,0 @@ -package dev.micle.totemofreviving.network; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.items.StrawTotemItem; -import dev.micle.totemofreviving.items.TotemOfRevivingItem; -import dev.micle.totemofreviving.utils.Utils; -import net.minecraft.ChatFormatting; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.stats.Stats; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.GameType; -import net.minecraftforge.fmllegacy.network.NetworkEvent; - -import java.util.UUID; -import java.util.function.Supplier; - -public class C2SRequestPlayerRevive { - private final UUID player_uuid; - private final InteractionHand hand; - - public C2SRequestPlayerRevive(final UUID player_uuid, final InteractionHand hand) { - this.player_uuid = player_uuid; - this.hand = hand; - } - - public static void encode(final C2SRequestPlayerRevive msg, FriendlyByteBuf packet_buffer) { - packet_buffer.writeUUID( msg.player_uuid); - packet_buffer.writeEnum(msg.hand); - } - - public static C2SRequestPlayerRevive decode(final FriendlyByteBuf packet_buffer) { - return new C2SRequestPlayerRevive(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class)); - } - - public static void handle(final C2SRequestPlayerRevive msg, final Supplier context_supplier) { - final NetworkEvent.Context context = context_supplier.get(); - context.enqueueWork(() -> { - final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid); - if (sender == null) { return; } - - ItemStack item = sender.getItemInHand(msg.hand); - if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) > TotemOfReviving.players.getPlayerCount()-1 || item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME).equals("")) { - sender.sendMessage(new TextComponent(ChatFormatting.RED + "Error getting target! (Try selecting the target again)"), sender.getUUID()); - } else { - ServerPlayer player_to_revive = TotemOfReviving.players.getPlayerByName(item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)); - ServerLevel player_to_revive_world = player_to_revive.getLevel(); - ServerLevel sender_world = sender.getLevel(); - int required_charge = player_to_revive.getStats().getValue(Stats.CUSTOM.get(Stats.DEATHS)); - if (player_to_revive.isSpectator()) { - if (player_to_revive_world.equals(sender_world)) { - if (item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT) >= required_charge) { - if (item.getOrCreateTag().contains(StrawTotemItem.TAG_FAIL_CHANCE)) { - int fail_chance = item.getOrCreateTag().getInt(StrawTotemItem.TAG_FAIL_CHANCE); - if (Utils.randomIntRange(0, 100) <= fail_chance) { - item.getOrCreateTag().putInt(StrawTotemItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(StrawTotemItem.TAG_CHARGE_AMOUNT)-required_charge); - item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge)); - sender.addEffect(new MobEffectInstance(MobEffects.POISON, ((fail_chance*10) / 2), 1)); - return; - } else { - item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance-(5*required_charge)); - } - } - player_to_revive.teleportTo(sender.getX(), sender.getY(), sender.getZ()); - player_to_revive.setGameMode(GameType.SURVIVAL); - item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT) - required_charge); - sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Successfully revived " + ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString()), sender.getUUID()); - } else { - sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Not enough charge! Required charge is: " + ChatFormatting.DARK_GRAY + required_charge), sender.getUUID()); - } - } else { - sender.sendMessage(new TextComponent(ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + ChatFormatting.GRAY + " is not in this dimension!"), sender.getUUID()); - } - } else { - sender.sendMessage(new TextComponent(ChatFormatting.DARK_GRAY + player_to_revive.getDisplayName().getString() + ChatFormatting.GRAY + " is not dead!"), sender.getUUID()); - } - } - }); - context.setPacketHandled(true); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java b/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java deleted file mode 100755 index 69032c7..0000000 --- a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemCharge.java +++ /dev/null @@ -1,63 +0,0 @@ -package dev.micle.totemofreviving.network; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.items.StrawTotemItem; -import dev.micle.totemofreviving.items.TotemOfRevivingItem; -import dev.micle.totemofreviving.utils.Utils; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraftforge.fmllegacy.network.NetworkEvent; - -import java.util.UUID; -import java.util.function.Supplier; - -public class C2SRequestTotemCharge { - private final UUID player_uuid; - private final InteractionHand hand; - private final InteractionHand item_charge_hand; - - public C2SRequestTotemCharge(final UUID player_uuid, final InteractionHand hand, final InteractionHand item_charge_hand) { - this.player_uuid = player_uuid; - this.hand = hand; - this.item_charge_hand = item_charge_hand; - } - - public static void encode(final C2SRequestTotemCharge msg, final FriendlyByteBuf packet_buffer) { - packet_buffer.writeUUID(msg.player_uuid); - packet_buffer.writeEnum(msg.hand); - packet_buffer.writeEnum(msg.item_charge_hand); - } - - public static C2SRequestTotemCharge decode(final FriendlyByteBuf packet_buffer) { - return new C2SRequestTotemCharge(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class), packet_buffer.readEnum(InteractionHand.class)); - } - - public static void handle(final C2SRequestTotemCharge msg, final Supplier context_supplier) { - final NetworkEvent.Context context = context_supplier.get(); - context.enqueueWork(() -> { - final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid); - if (sender == null) { return; } - - ItemStack charge_item = sender.getItemInHand(msg.item_charge_hand); - ItemStack totem_item = sender.getItemInHand(msg.hand); - charge_item.setCount(charge_item.getCount()-1); - totem_item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT, totem_item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_CHARGE_AMOUNT)+1); - - if (totem_item.getOrCreateTag().contains(StrawTotemItem.TAG_FAIL_CHANCE)) { - int fail_chance = totem_item.getOrCreateTag().getInt(StrawTotemItem.TAG_FAIL_CHANCE); - if (Utils.randomIntRange(0, 100) <= fail_chance) { - sender.setItemInHand(msg.hand, new ItemStack(Items.AIR)); - sender.addEffect(new MobEffectInstance(MobEffects.POISON, ((fail_chance*10) / 2), 1)); - } else { - totem_item.getOrCreateTag().putInt(StrawTotemItem.TAG_FAIL_CHANCE, fail_chance+5); - } - } - }); - context.setPacketHandled(true); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java b/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java deleted file mode 100755 index 17817f8..0000000 --- a/src/main/java/dev/micle/totemofreviving/network/C2SRequestTotemTarget.java +++ /dev/null @@ -1,52 +0,0 @@ -package dev.micle.totemofreviving.network; - -import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.items.TotemOfRevivingItem; -import net.minecraft.ChatFormatting; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.fmllegacy.network.NetworkEvent; - -import java.util.UUID; -import java.util.function.Supplier; - -public class C2SRequestTotemTarget { - private final UUID player_uuid; - private final InteractionHand hand; - - public C2SRequestTotemTarget(final UUID player_uuid, final InteractionHand hand) { - this.player_uuid = player_uuid; - this.hand = hand; - } - - public static void encode(final C2SRequestTotemTarget msg, final FriendlyByteBuf packet_buffer) { - packet_buffer.writeUUID(msg.player_uuid); - packet_buffer.writeEnum(msg.hand); - } - - public static C2SRequestTotemTarget decode(final FriendlyByteBuf packet_buffer) { - return new C2SRequestTotemTarget(packet_buffer.readUUID(), packet_buffer.readEnum(InteractionHand.class)); - } - - public static void handle(final C2SRequestTotemTarget msg, final Supplier context_supplier) { - final NetworkEvent.Context context = context_supplier.get(); - context.enqueueWork(() -> { - final ServerPlayer sender = TotemOfReviving.players.getPlayer(msg.player_uuid); - if (sender == null) { return; } - - ItemStack item = sender.getItemInHand(msg.hand); - int current_player_index = item.getOrCreateTag().getInt(TotemOfRevivingItem.TAG_TARGET_INDEX) + 1; - if (current_player_index > TotemOfReviving.players.getPlayerCount()-1) { - current_player_index = 0; - } - - item.getOrCreateTag().putInt(TotemOfRevivingItem.TAG_TARGET_INDEX, current_player_index); - item.getOrCreateTag().putString(TotemOfRevivingItem.TAG_TARGET_NAME, TotemOfReviving.players.getPlayers().get(current_player_index).getDisplayName().getString()); - sender.sendMessage(new TextComponent(ChatFormatting.GRAY + "Target: " + ChatFormatting.DARK_GRAY + item.getOrCreateTag().getString(TotemOfRevivingItem.TAG_TARGET_NAME)), sender.getUUID()); - }); - context.setPacketHandled(true); - } -} diff --git a/src/main/java/dev/micle/totemofreviving/network/ChangeTargetPacket.java b/src/main/java/dev/micle/totemofreviving/network/ChangeTargetPacket.java new file mode 100644 index 0000000..806392d --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/network/ChangeTargetPacket.java @@ -0,0 +1,55 @@ +package dev.micle.totemofreviving.network; + +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.TextComponent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.players.PlayerList; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.fmllegacy.network.NetworkEvent; + +import java.util.function.Supplier; + +public class ChangeTargetPacket { + private final InteractionHand hand; + + public ChangeTargetPacket(final InteractionHand hand) { + this.hand = hand; + } + + public static void encode(final ChangeTargetPacket packet, final FriendlyByteBuf buffer) { + Network.writeVersionInfo(buffer, false); + buffer.writeEnum(packet.hand); + } + + public static ChangeTargetPacket decode(final FriendlyByteBuf buffer) { + Network.checkVersion(buffer); + return new ChangeTargetPacket(buffer.readEnum(InteractionHand.class)); + } + + public static void handle(final ChangeTargetPacket packet, final Supplier contextSupplier) { + final NetworkEvent.Context context = contextSupplier.get(); + context.enqueueWork(() -> { + ServerPlayer sender = context.getSender(); + if (sender == null) { return; } + + ItemStack totemStack = sender.getItemInHand(packet.hand); + PlayerList playerList = TotemOfReviving.PROXY.getServer().getPlayerList(); + int targetIndex = TotemItem.getTargetIndex(totemStack) + 1; + + if (targetIndex > playerList.getPlayerCount()-1) { targetIndex = 0; } + ServerPlayer target = playerList.getPlayers().get(targetIndex); + + TotemItem.setTargetIndex(totemStack, targetIndex); + TotemItem.setTargetUUID(totemStack, target.getUUID()); + TotemItem.setTargetName(totemStack, target.getDisplayName().getString()); + TotemItem.setTargetDeaths(totemStack, target); + + sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Now targetting " + ChatFormatting.GRAY + target.getDisplayName().getString() + "."), sender.getUUID()); + }); + context.setPacketHandled(true); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/network/ChargeTotemPacket.java b/src/main/java/dev/micle/totemofreviving/network/ChargeTotemPacket.java new file mode 100644 index 0000000..038fea9 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/network/ChargeTotemPacket.java @@ -0,0 +1,45 @@ +package dev.micle.totemofreviving.network; + +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 net.minecraftforge.fmllegacy.network.NetworkEvent; + +import java.util.function.Supplier; + +public class ChargeTotemPacket { + private final InteractionHand hand; + + public ChargeTotemPacket(final InteractionHand hand) { + this.hand = hand; + } + + public static void encode(final ChargeTotemPacket packet, final FriendlyByteBuf buffer) { + Network.writeVersionInfo(buffer, false); + buffer.writeEnum(packet.hand); + } + + public static ChargeTotemPacket decode(final FriendlyByteBuf buffer) { + Network.checkVersion(buffer); + return new ChargeTotemPacket(buffer.readEnum(InteractionHand.class)); + } + + public static void handle(final ChargeTotemPacket packet, final Supplier contextSupplier) { + final NetworkEvent.Context context = contextSupplier.get(); + context.enqueueWork(() -> { + ServerPlayer sender = context.getSender(); + if (sender == null) { return; } + + ItemStack totemStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getMainHandItem() : sender.getOffhandItem(); + ItemStack chargeStack = (packet.hand.equals(InteractionHand.MAIN_HAND)) ? sender.getOffhandItem() : sender.getMainHandItem(); + + if (TotemItem.isTotemFull(totemStack)) { return; } + + TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) + 1); + chargeStack.setCount(chargeStack.getCount() - 1); + }); + context.setPacketHandled(true); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/network/Network.java b/src/main/java/dev/micle/totemofreviving/network/Network.java new file mode 100644 index 0000000..8aa8e4d --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/network/Network.java @@ -0,0 +1,83 @@ +package dev.micle.totemofreviving.network; + +import dev.micle.totemofreviving.TotemOfReviving; +import dev.micle.totemofreviving.util.MismatchedVersionException; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraftforge.fmllegacy.network.NetworkRegistry; +import net.minecraftforge.fmllegacy.network.simple.SimpleChannel; + +import java.util.Objects; +import java.util.regex.Pattern; + +public class Network { + public static final String VERSION = TotemOfReviving.MOD_ID + "-net-1"; + private static final Pattern NET_VERSION_PATTERN = Pattern.compile(TotemOfReviving.MOD_ID + "-net-\\d+$"); + private static final Pattern MOD_VERSION_PATTERN = Pattern.compile("Forge-\\d+\\.\\d+\\.\\d+-\\d+\\.\\d+\\.\\d+$"); + + public static SimpleChannel channel; + + public static void init() { + channel = NetworkRegistry.ChannelBuilder.named(TotemOfReviving.createResourceLocation("network")) + .clientAcceptedVersions(s -> Objects.equals(s, VERSION)) + .serverAcceptedVersions(s -> Objects.equals(s, VERSION)) + .networkProtocolVersion(() -> VERSION) + .simpleChannel(); + + int id = 0; + channel.messageBuilder(ChangeTargetPacket.class, id++) + .encoder(ChangeTargetPacket::encode) + .decoder(ChangeTargetPacket::decode) + .consumer(ChangeTargetPacket::handle) + .add(); + channel.messageBuilder(ChargeTotemPacket.class, id++) + .encoder(ChargeTotemPacket::encode) + .decoder(ChargeTotemPacket::decode) + .consumer(ChargeTotemPacket::handle) + .add(); + channel.messageBuilder(ReviveTargetPacket.class, id++) + .encoder(ReviveTargetPacket::encode) + .decoder(ReviveTargetPacket::decode) + .consumer(ReviveTargetPacket::handle) + .add(); + } + + public static void writeVersionInfo(FriendlyByteBuf buffer, boolean senderIsServer) { + buffer.writeBoolean(senderIsServer); + buffer.writeUtf(VERSION); + buffer.writeUtf(TotemOfReviving.getVersion()); + } + + public static void checkVersion(FriendlyByteBuf buffer) { + boolean senderIsServer = buffer.readBoolean(); + String serverNetVersion = (senderIsServer) ? readNetVersion(buffer) : VERSION; + String serverModVersion = (senderIsServer) ? readModVersion(buffer) : TotemOfReviving.getVersion(); + String clientNetVersion = (senderIsServer) ? VERSION : readNetVersion(buffer); + String clientModVersion = (senderIsServer) ? TotemOfReviving.getVersion() : readModVersion(buffer); + + if (!serverNetVersion.equals(clientNetVersion)) { + throw new MismatchedVersionException( + String.format("The server and client are running different versions of [Micle's Totem of Reviving]. " + + "Try updating this mod on either the client and or the server. " + + "Client version is %s (%s). Server version is %s (%s)", + clientModVersion, clientNetVersion, + serverModVersion, serverNetVersion) + ); + } + } + + public static String readNetVersion(FriendlyByteBuf buffer) { + String netVersion = buffer.readUtf(); + if (!NET_VERSION_PATTERN.matcher(netVersion).matches()) { + return "UNKNOWN (" + netVersion + ")"; + } + return netVersion; + } + + public static String readModVersion(FriendlyByteBuf buffer) { + String modVersion = buffer.readUtf(); + if (!modVersion.equals("NONE") && !MOD_VERSION_PATTERN.matcher(modVersion).matches()) { + return "UNKNOWN (" + modVersion + ")"; + } + return modVersion; + } +} diff --git a/src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java b/src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java new file mode 100644 index 0000000..e08c19b --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/network/ReviveTargetPacket.java @@ -0,0 +1,73 @@ +package dev.micle.totemofreviving.network; + +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.TextComponent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.fmllegacy.network.NetworkEvent; + +import java.util.function.Supplier; + +public class ReviveTargetPacket { + private final InteractionHand hand; + + public ReviveTargetPacket(final InteractionHand hand) { + this.hand = hand; + } + + public static void encode(final ReviveTargetPacket packet, final FriendlyByteBuf buffer) { + Network.writeVersionInfo(buffer, false); + buffer.writeEnum(packet.hand); + } + + public static ReviveTargetPacket decode(final FriendlyByteBuf buffer) { + Network.checkVersion(buffer); + return new ReviveTargetPacket(buffer.readEnum(InteractionHand.class)); + } + + public static void handle(final ReviveTargetPacket packet, final Supplier contextSupplier) { + final NetworkEvent.Context context = contextSupplier.get(); + context.enqueueWork(() -> { + ServerPlayer sender = context.getSender(); + if (sender == null) { return; } + + ItemStack totemStack = sender.getItemInHand(packet.hand); + ServerPlayer target; + + try { + target = TotemOfReviving.PROXY.getServer().getPlayerList().getPlayer(TotemItem.getTargetUUID(totemStack)); + if (target == null) { throw new NullPointerException("Target is null!"); } + } catch (NullPointerException exception) { + sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Unable to find player!"), sender.getUUID()); + return; + } + + if (!target.isSpectator()) { + sender.sendMessage(new TextComponent(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is not dead!"), sender.getUUID()); + return; + } + + if (!target.getLevel().equals(sender.getLevel()) && !TotemItem.canReviveAcrossDimensions(totemStack)) { + sender.sendMessage(new TextComponent(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is in a different dimension!"), sender.getUUID()); + return; + } + + TotemItem.setTargetDeaths(totemStack, target); + if (!TotemItem.canTotemAffordTarget(totemStack)) { + sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Not enough charge!"), sender.getUUID()); + return; + } + + target.teleportTo(sender.getLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot()); + target.setGameMode(sender.getLevel().getServer().getDefaultGameType()); + TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack)); + totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand)); + sender.sendMessage(new TextComponent(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!"), sender.getUUID()); + }); + context.setPacketHandled(true); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModItems.java b/src/main/java/dev/micle/totemofreviving/setup/ModItems.java index 93ced3b..2e591f4 100755 --- a/src/main/java/dev/micle/totemofreviving/setup/ModItems.java +++ b/src/main/java/dev/micle/totemofreviving/setup/ModItems.java @@ -1,18 +1,26 @@ package dev.micle.totemofreviving.setup; -import dev.micle.totemofreviving.items.RevivingChargeItem; -import dev.micle.totemofreviving.items.StrawChargeItem; -import dev.micle.totemofreviving.items.StrawTotemItem; -import dev.micle.totemofreviving.items.TotemOfRevivingItem; +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 net.minecraft.world.item.Item; import net.minecraftforge.fmllegacy.RegistryObject; public class ModItems { - public static final RegistryObject TOTEM_OF_REVIVING = Registration.ITEMS.register("totem_of_reviving", TotemOfRevivingItem::new); - public static final RegistryObject REVIVING_CHARGE = Registration.ITEMS.register("reviving_charge", RevivingChargeItem::new); - public static final RegistryObject STRAW_TOTEM = Registration.ITEMS.register("straw_totem", StrawTotemItem::new); - public static final RegistryObject STRAW_CHARGE = Registration.ITEMS.register("straw_charge", StrawChargeItem::new); - - static void register() { - } + public static RegistryObject STRAW_TOTEM = Registration.ITEMS.register(StrawTotemItem.getName(), StrawTotemItem::new); + public static RegistryObject IRON_TOTEM = Registration.ITEMS.register(IronTotemItem.getName(), IronTotemItem::new); + public static RegistryObject DIAMOND_TOTEM = Registration.ITEMS.register(DiamondTotemItem.getName(), DiamondTotemItem::new); + public static RegistryObject NETHERITE_TOTEM = Registration.ITEMS.register(NetheriteTotemItem.getName(), NetheriteTotemItem::new); + + public static RegistryObject STRAW_CHARGE = Registration.ITEMS.register(StrawChargeItem.getName(), StrawChargeItem::new); + public static RegistryObject IRON_CHARGE = Registration.ITEMS.register(IronChargeItem.getName(), IronChargeItem::new); + public static RegistryObject DIAMOND_CHARGE = Registration.ITEMS.register(DiamondChargeItem.getName(), DiamondChargeItem::new); + public static RegistryObject NETHERITE_CHARGE = Registration.ITEMS.register(NetheriteChargeItem.getName(), NetheriteChargeItem::new); + + public static void register() {} } diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java b/src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java index 2294ded..ca00e41 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java +++ b/src/main/java/dev/micle/totemofreviving/setup/ModKeyMappings.java @@ -4,5 +4,6 @@ import com.mojang.blaze3d.platform.InputConstants; import net.minecraft.client.KeyMapping; public class ModKeyMappings { - public static final KeyMapping KEYMAP_UI_LSHIFT = new KeyMapping("KEYMAP_UI_LSHIFT", InputConstants.KEY_LSHIFT, KeyMapping.CATEGORY_INTERFACE); + public static final KeyMapping ADVANCED_TOOLTIP = + new KeyMapping("advanced_tooltip", InputConstants.KEY_LSHIFT, KeyMapping.CATEGORY_INVENTORY); } diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModRecipes.java b/src/main/java/dev/micle/totemofreviving/setup/ModRecipes.java new file mode 100644 index 0000000..a7d2982 --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/setup/ModRecipes.java @@ -0,0 +1,16 @@ +package dev.micle.totemofreviving.setup; + +import dev.micle.totemofreviving.item.crafting.ChargeRecipe; +import dev.micle.totemofreviving.item.crafting.ExtendedShapedRecipe; +import dev.micle.totemofreviving.item.crafting.TotemRecipe; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraftforge.fmllegacy.RegistryObject; + +public class ModRecipes { + public static final RegistryObject> TOTEM_RECIPE = + Registration.RECIPE_SERIALIZERS.register("totem_recipe", () -> ExtendedShapedRecipe.Serializer.basic(TotemRecipe::new)); + public static final RegistryObject> CHARGE_RECIPE = + Registration.RECIPE_SERIALIZERS.register("charge_recipe", () -> ExtendedShapedRecipe.Serializer.basic(ChargeRecipe::new)); + + public static void register() {} +} diff --git a/src/main/java/dev/micle/totemofreviving/setup/Registration.java b/src/main/java/dev/micle/totemofreviving/setup/Registration.java index 53e2a1f..e1a3cee 100755 --- a/src/main/java/dev/micle/totemofreviving/setup/Registration.java +++ b/src/main/java/dev/micle/totemofreviving/setup/Registration.java @@ -1,25 +1,30 @@ package dev.micle.totemofreviving.setup; import dev.micle.totemofreviving.TotemOfReviving; -import dev.micle.totemofreviving.events.ServerTickEventHandler; import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.MinecraftForge; +import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.IForgeRegistryEntry; public class Registration { - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, TotemOfReviving.MOD_ID); - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, TotemOfReviving.MOD_ID); + public static final DeferredRegister ITEMS = create(ForgeRegistries.ITEMS); + public static final DeferredRegister> RECIPE_SERIALIZERS = create(ForgeRegistries.RECIPE_SERIALIZERS); public static void register() { - IEventBus mod_event_bus = FMLJavaModLoadingContext.get().getModEventBus(); - BLOCKS.register(mod_event_bus); - ITEMS.register(mod_event_bus); - MinecraftForge.EVENT_BUS.register(new ServerTickEventHandler()); - + IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); + + ITEMS.register(modEventBus); ModItems.register(); + + RECIPE_SERIALIZERS.register(modEventBus); + ModRecipes.register(); } + + private static > DeferredRegister create(IForgeRegistry registry) { + return DeferredRegister.create(registry, TotemOfReviving.MOD_ID); + } } diff --git a/src/main/java/dev/micle/totemofreviving/util/MismatchedVersionException.java b/src/main/java/dev/micle/totemofreviving/util/MismatchedVersionException.java new file mode 100644 index 0000000..0a9bc5f --- /dev/null +++ b/src/main/java/dev/micle/totemofreviving/util/MismatchedVersionException.java @@ -0,0 +1,7 @@ +package dev.micle.totemofreviving.util; + +public class MismatchedVersionException extends RuntimeException { + public MismatchedVersionException(String msg) { + super(msg); + } +} diff --git a/src/main/java/dev/micle/totemofreviving/utils/Utils.java b/src/main/java/dev/micle/totemofreviving/utils/Utils.java deleted file mode 100755 index e11b706..0000000 --- a/src/main/java/dev/micle/totemofreviving/utils/Utils.java +++ /dev/null @@ -1,19 +0,0 @@ -package dev.micle.totemofreviving.utils; - -public class Utils { - public static float clamp(float val, float min, float max) { - return Math.max(min, Math.min(max, val)); - } - - public static int randomIntRange(int min, int max) { - return (int) randomDoubleRange(min, max); - } - - public static float randomFloatRange(float min, float max) { - return (float) randomDoubleRange(min, max); - } - - public static double randomDoubleRange(double min, double max) { - return ((Math.random() * (max - min)) + min); - } -} diff --git a/src/main/resources/assets/totemofreviving/lang/en_us.json b/src/main/resources/assets/totemofreviving/lang/en_us.json index 11a801d..3f8242a 100755 --- a/src/main/resources/assets/totemofreviving/lang/en_us.json +++ b/src/main/resources/assets/totemofreviving/lang/en_us.json @@ -1,6 +1,11 @@ { - "item.totemofreviving.totem_of_reviving": "Totem of Reviving", - "item.totemofreviving.reviving_charge": "Reviving charge", - "item.totemofreviving.straw_totem": "Straw Totem of Reviving", - "item.totemofreviving.straw_charge": "Straw reviving charge" + "itemGroup.totemofreviving": "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" } \ No newline at end of file diff --git a/src/main/resources/assets/totemofreviving/textures/item/reviving_charge.png b/src/main/resources/assets/totemofreviving/textures/item/diamond_charge.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/reviving_charge.png rename to src/main/resources/assets/totemofreviving/textures/item/diamond_charge.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/totem_of_reviving.png b/src/main/resources/assets/totemofreviving/textures/item/diamond_totem.png similarity index 100% rename from src/main/resources/assets/totemofreviving/textures/item/totem_of_reviving.png rename to src/main/resources/assets/totemofreviving/textures/item/diamond_totem.png diff --git a/src/main/resources/assets/totemofreviving/textures/item/iron_charge.png b/src/main/resources/assets/totemofreviving/textures/item/iron_charge.png new file mode 100755 index 0000000000000000000000000000000000000000..f52f9a7704a9e4b79de88751bbb34f1061333c6a GIT binary patch literal 721 zcmV;?0xtcDP)EX>4Tx04R}tkv&MmP!xqvQ$>-AU^|G2WT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#1@OU5R-E(>GJV2ZLMN=c5B95w>PV*{h@IUySt(Bjg@Fs=gKMWw&%l-5@>lA>%qQu! zmKHq%`nG|K>z1bM0hc?#z>^`HvMU8?3Hdzmen#Jv1;V#L&zhH8^BkuSK$@~j-T()O zz-WPHulu~ayFIsmdz$(E0BHeoqqRVvYXATM24YJ`L;!REbO3bmfr!}v000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&416E7tD#w88_007NNL_t(I%iWPJ4#GeXg})MP z-G&PgL>(b%T^*`77_+hm*qd;LnjQmDL9(k!55c$|U@<@lKW#t}o|$AOZ|1!>@bk#? zJdVw0Q{*hmzPoI#jn>*YrDXPwY>c64n&hj?&bbJ1t@lbEF@J0rV^h@wA}tdjQfjWqaDOS}qU~s;atK8eI@VNK}IcL|1ZmuO9r%UOV@RT5R%CduPT73syAD&$bW(}BivTorI!@w00000NkvXXu0mjf DUrjvj literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/totemofreviving/textures/item/iron_totem.png b/src/main/resources/assets/totemofreviving/textures/item/iron_totem.png new file mode 100755 index 0000000000000000000000000000000000000000..04385b72e9a74b019be2d360c39f83dc79291484 GIT binary patch literal 826 zcmV-A1I7G_P)EX>4Tx04R}tkv&MmP!xqvQ$>-AU^|G2WT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#1@OU5R-E(>GJV2ZLMN=c5B95w>PV*{h@IUySt(Bjg@Fs=gKMWw&%l-5@>lA>%qQu! zmKHq%`nG|K>z1bM0hc?#z>^`HvMU8?3Hdzmen#Jv1;V#L&zhH8^BkuSK$@~j-T()O zz-WPHulu~ayFIsmdz$(E0BHeoqqRVvYXATM24YJ`L;!REbO3bmfr!}v000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&416D%GU=dXVN00A~hL_t(I%cYZ{Zo@DXMNg|y zqiJ6d5LqK72@9F}4`GF+<3U4Z{(-<0^#>+RnlxZAsSSASq2iG;k7p>^nmW^_UUsja z{jTq`;Y!S6;%c?(VtUgw7xg!>%~e%RHSETR%*Pd~3P75sq-jbBfe^yk+OG}(L>0c5fK@93{eLUA5Xm9zSAvVXxnz+*l%PO&jIk>QxpYxp5vVR zzCzP9Gga*XthIy?D9dt~LXXqwg!dlrJ%__#c9uaeSZh0D47=U#%vQPgoV(~g`H;p~EEfNB(7X7_W8DG10NUV+Xh~>&$^ZZW07*qoM6N<$ Ef)s&uv;Y7A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/totemofreviving/textures/item/netherite_charge.png b/src/main/resources/assets/totemofreviving/textures/item/netherite_charge.png new file mode 100755 index 0000000000000000000000000000000000000000..a2d7a248b82986f31f187cbc1dbf216054bd43b8 GIT binary patch literal 741 zcmVEX>4Tx04R}tkv&MmP!xqvQ$>-AU^|G2WT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#1@OU5R-E(>GJV2ZLMN=c5B95w>PV*{h@IUySt(Bjg@Fs=gKMWw&%l-5@>lA>%qQu! zmKHq%`nG|K>z1bM0hc?#z>^`HvMU8?3Hdzmen#Jv1;V#L&zhH8^BkuSK$@~j-T()O zz-WPHulu~ayFIsmdz$(E0BHeoqqRVvYXATM24YJ`L;!REbO3bmfr!}v000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&416Ey^Ih5sD@007}hL_t(I%iWPrio!4$#eWr7 zwFLtr3aJzd_20@Xh>P(|-oTwlm>Y-}@Dze03Fh|a4IW^23Zpeb2&wxw0o8|8hm&R0rGX-Fc)=8{;<~Pv^ XF3V6vhkaf*00000NkvXXu0mjfp#4Yx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/totemofreviving/textures/item/netherite_totem.png b/src/main/resources/assets/totemofreviving/textures/item/netherite_totem.png new file mode 100755 index 0000000000000000000000000000000000000000..eeba15a338707cd642ee60189d247976273f354a GIT binary patch literal 836 zcmV-K1H1f*P)EX>4Tx04R}tkv&MmP!xqvQ$>-AU^|G2WT;LSL`5963Pq?8YK2xEOkVm2O&XFE z7e~Rh;NZ_<)xpJCR|i)?5c~mgbaGO3krMAq3N2#1@OU5R-E(>GJV2ZLMN=c5B95w>PV*{h@IUySt(Bjg@Fs=gKMWw&%l-5@>lA>%qQu! zmKHq%`nG|K>z1bM0hc?#z>^`HvMU8?3Hdzmen#Jv1;V#L&zhH8^BkuSK$@~j-T()O zz-WPHulu~ayFIsmdz$(E0BHeoqqRVvYXATM24YJ`L;!REbO3bmfr!}v000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&416Eh#Ix{-GP00BTrL_t(I%cYY`OT$1Eg};ic zCV>uUX{9d^q9BEWf)VS&KjGhSA^tU2ZiTKy5Q{DfNgEmol7vj+Hm*9@Jbci*yNCNY zbIu*uFluGsL8qIQ;cxDuP`_Q)Yz{|N3$y%?!T>)_Fah(>1i)K*0LWP4rwP9@00^Rh z$z(#m*GI;ZAPOoq*eU}p%L2feI|Nan^0Fvp@OZ29@S<^ZH^f_dDi>FOWN^QG&E?S< z-qJ(HQstF4=56!Sgh8uKXRr@|YtOLXJ(`+cuvIZIha+~nJ^VCbY>lZm1g<^9wP(~D zf