minecraft-mods/totem_of_reviving
Private
Public Access
1
0
Fork 0
Code Issues Projects Releases 2 Wiki Activity

Finished porting to 1.20.1.

Browse Source
This commit is contained in:
Michal Niczejewski
2024-01-26 21:23:09 +00:00
parent 813e5d4255
commit 499aa2192e
10 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_charge.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:diamond_charge" "totemofreviving:diamond_charge"
] ]
} },
"sends_telemetry_event": false
} }

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/diamond_totem.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:diamond_totem" "totemofreviving:diamond_totem"
] ]
} },
"sends_telemetry_event": false
} }

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_charge.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:iron_charge" "totemofreviving:iron_charge"
] ]
} },
"sends_telemetry_event": false
} }

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/iron_totem.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:iron_totem" "totemofreviving:iron_totem"
] ]
} },
"sends_telemetry_event": false
} }

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_charge.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:netherite_charge" "totemofreviving:netherite_charge"
] ]
} },
"sends_telemetry_event": false
} }

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/netherite_totem.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:netherite_totem" "totemofreviving:netherite_totem"
] ]
} },
"sends_telemetry_event": false
} }

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_charge.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:straw_charge" "totemofreviving:straw_charge"
] ]
} },
"sends_telemetry_event": false
} }

3
src/generated/resources/data/totemofreviving/advancements/recipes/tools/straw_totem.json
View File

@ -30,5 +30,6 @@
"recipes": [ "recipes": [
"totemofreviving:straw_totem" "totemofreviving:straw_totem"
] ]
} },
"sends_telemetry_event": false
} }

6
src/main/java/dev/micle/totemofreviving/network/client/ReviveTargetPacket.java
View File

@ -49,7 +49,7 @@ public class ReviveTargetPacket {
return; 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!")); sender.sendSystemMessage(Component.literal(ChatFormatting.GRAY + target.getDisplayName().getString() + ChatFormatting.WHITE + " is in a different dimension!"));
return; return;
} }
@ -60,8 +60,8 @@ public class ReviveTargetPacket {
return; return;
} }
target.teleportTo(sender.getLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot()); target.teleportTo(sender.serverLevel(), sender.position().x, sender.position().y, sender.position().z, sender.getYRot(), sender.getXRot());
target.setGameMode(sender.getLevel().getServer().getDefaultGameType()); target.setGameMode(sender.serverLevel().getServer().getDefaultGameType());
TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack)); TotemItem.setCharge(totemStack, TotemItem.getCharge(totemStack) - TotemItem.getTargetCost(totemStack));
totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand)); totemStack.hurtAndBreak(1, sender, e -> e.broadcastBreakEvent(packet.hand));
sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!")); sender.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Successfully revived " + ChatFormatting.GRAY + target.getDisplayName().getString() + "!"));

2
src/main/java/dev/micle/totemofreviving/setup/ModCreativeModeTabs.java
View File

@ -6,7 +6,7 @@ import net.minecraft.world.item.CreativeModeTab;
import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.registries.RegistryObject;
public class ModCreativeModeTabs { public class ModCreativeModeTabs {
public static RegistryObject<CreativeModeTab> MAIN = Registration.CREATIVE_MODE_TABS.register("Main", public static RegistryObject<CreativeModeTab> MAIN = Registration.CREATIVE_MODE_TABS.register("main",
() -> CreativeModeTab.builder() () -> CreativeModeTab.builder()
.title(Component.translatable(String.format("itemGroup.%s.main", TotemOfReviving.MOD_ID))) .title(Component.translatable(String.format("itemGroup.%s.main", TotemOfReviving.MOD_ID)))
.icon(ModItems.STRAW_TOTEM.get()::getDefaultInstance) .icon(ModItems.STRAW_TOTEM.get()::getDefaultInstance)