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

Fixed advanced tooltip key press check. Removed old broken mod key mappings.

Browse Source
This commit is contained in:
micle
2026-01-12 03:57:26 +01:00
parent b03aa3e0ed
commit 5b2771c1f7
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/dev/micle/totem_of_reviving/item/totem/TotemItem.java
View File

@ -3,8 +3,8 @@ package dev.micle.totem_of_reviving.item.totem;
import dev.micle.totem_of_reviving.component.TotemData; import dev.micle.totem_of_reviving.component.TotemData;
import dev.micle.totem_of_reviving.setup.Config; import dev.micle.totem_of_reviving.setup.Config;
import dev.micle.totem_of_reviving.setup.ModDataComponents; import dev.micle.totem_of_reviving.setup.ModDataComponents;
import dev.micle.totem_of_reviving.setup.ModKeyMappings;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
@ -19,9 +19,8 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.lwjgl.glfw.GLFW;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import java.io.IOException; import java.io.IOException;
@ -217,7 +216,7 @@ public abstract class TotemItem extends Item {
tooltipComponents.add(Component.empty()); tooltipComponents.add(Component.empty());
if (ModKeyMappings.ADVANCED_TOOLTIP.isDown()) { if (GLFW.glfwGetKey(Minecraft.getInstance().getWindow().getWindow(), GLFW.GLFW_KEY_LEFT_SHIFT) == 1) {
tooltipComponents.add(Component.literal(ChatFormatting.GRAY + "Showing advanced tooltip.")); tooltipComponents.add(Component.literal(ChatFormatting.GRAY + "Showing advanced tooltip."));
tooltipComponents.add(Component.literal(ChatFormatting.WHITE + "[" + ChatFormatting.GRAY + "R-CLICK" + ChatFormatting.WHITE + "]")); tooltipComponents.add(Component.literal(ChatFormatting.WHITE + "[" + ChatFormatting.GRAY + "R-CLICK" + ChatFormatting.WHITE + "]"));
tooltipComponents.add(Component.literal(ChatFormatting.WHITE + "When second hand is empty: revive target.")); tooltipComponents.add(Component.literal(ChatFormatting.WHITE + "When second hand is empty: revive target."));
@ -235,17 +234,26 @@ public abstract class TotemItem extends Item {
@Override @Override
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
public @NotNull InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand usedHand) { public @NotNull InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand usedHand) {
if (!level.isClientSide) return super.use(level, player, usedHand); if (level.isClientSide) return super.use(level, player, usedHand);
System.out.println("HERE");
EquipmentSlot equipmentSlot = (usedHand.equals(InteractionHand.MAIN_HAND)) ? EquipmentSlot.MAINHAND : EquipmentSlot.OFFHAND;
ItemStack totemStack = (usedHand.equals(InteractionHand.MAIN_HAND)) ? player.getMainHandItem() : player.getOffhandItem();
ItemStack chargeStack = (usedHand.equals(InteractionHand.MAIN_HAND)) ? player.getOffhandItem() : player.getMainHandItem(); ItemStack chargeStack = (usedHand.equals(InteractionHand.MAIN_HAND)) ? player.getOffhandItem() : player.getMainHandItem();
if (player.isCrouching()) { if (player.isCrouching()) {
// Change Target Packet // Change Target Packet
Optional<TotemData> totemData = cycleTarget(totemStack, level.getServer().getPlayerList());
totemData.ifPresent(data -> player.sendSystemMessage(Component.literal(ChatFormatting.WHITE + "Now targetting " + ChatFormatting.GRAY + data.getTargetName() + ".")));
} else { } else {
if (isCharge(chargeStack)) { if (isCharge(chargeStack)) {
// Charge Totem Packet // Charge Totem Packet
chargeTotem(totemStack, chargeStack);
} else { } else {
// Revive Target Packet // Revive Target Packet
Component message = reviveTarget(equipmentSlot, totemStack, level.getServer().getPlayerList().getPlayer(player.getUUID()), level.getServer().getPlayerList());
player.sendSystemMessage(message);
} }
} }

9
src/main/java/dev/micle/totem_of_reviving/setup/ModKeyMappings.java
View File

@ -1,9 +0,0 @@
package dev.micle.totem_of_reviving.setup;
import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.KeyMapping;
public class ModKeyMappings {
public static final KeyMapping ADVANCED_TOOLTIP =
new KeyMapping("advanced_tooltips", InputConstants.KEY_LSHIFT, KeyMapping.CATEGORY_INVENTORY);
}