From 499aa2192ebb00fae7ac04a21338792764dd5eb0 Mon Sep 17 00:00:00 2001 From: Michal Niczejewski Date: Fri, 26 Jan 2024 21:23:09 +0000 Subject: [PATCH] Finished porting to 1.20.1. --- .../advancements/recipes/tools/diamond_charge.json | 3 ++- .../advancements/recipes/tools/diamond_totem.json | 3 ++- .../advancements/recipes/tools/iron_charge.json | 3 ++- .../advancements/recipes/tools/iron_totem.json | 3 ++- .../advancements/recipes/tools/netherite_charge.json | 3 ++- .../advancements/recipes/tools/netherite_totem.json | 3 ++- .../advancements/recipes/tools/straw_charge.json | 3 ++- .../advancements/recipes/tools/straw_totem.json | 3 ++- .../totemofreviving/network/client/ReviveTargetPacket.java | 6 +++--- .../micle/totemofreviving/setup/ModCreativeModeTabs.java | 2 +- 10 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json index 62c6977..10a7794 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:diamond_charge" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json index cbf8701..8c4f65c 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:diamond_totem" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json index 1acb7f3..f7a271b 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:iron_charge" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json index 22595a8..ad81002 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:iron_totem" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json index 7bba880..fb06f38 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:netherite_charge" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json index 84a9203..0a1e827 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:netherite_totem" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json index 30910c2..a887932 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:straw_charge" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json index 185d4a0..28934fb 100644 --- a/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json +++ b/src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json @@ -30,5 +30,6 @@ "recipes": [ "totemofreviving:straw_totem" ] - } + }, + "sends_telemetry_event": false } \ No newline at end of file diff --git a/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java b/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java index 82daa58..1bb5f5b 100644 --- a/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java +++ b/src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java @@ -49,7 +49,7 @@ public class ReviveTargetPacket { return; } - if (!target.getLevel().equals(sender.getLevel()) && !TotemItem.canReviveAcrossDimensions(totemStack)) { + if (!target.serverLevel().equals(sender.serverLevel()) && !TotemItem.canReviveAcrossDimensions(totemStack)) { sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is in a different dimension!")); return; } @@ -60,8 +60,8 @@ public class ReviveTargetPacket { return; } - target.teleportTo(sender.getLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot()); - target.setGameMode(sender.getLevel().getServer().getDefaultGameType()); + target.teleportTo(sender.serverLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot()); + target.setGameMode(sender.serverLevel().getServer().getDefaultGameType()); TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack)); totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand)); sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!")); diff --git a/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java b/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java index e71fbf3..045d75d 100644 --- a/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java +++ b/src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java @@ -6,7 +6,7 @@ import net.minecraft.world.item.CreativeModeTab; import net.minecraftforge.registries.RegistryObject; public class ModCreativeModeTabs { - public static RegistryObject MAIN = Registration.CREATIVE_MODE_TABS.register("Main", + public static RegistryObject MAIN = Registration.CREATIVE_MODE_TABS.register("main", () -> CreativeModeTab.builder() .title(Component.translatable(String.format("itemGroup.%s.main", TotemOfReviving.MOD_ID))) .icon(ModItems.STRAW_TOTEM.get()::getDefaultInstance)