Merge remote-tracking branch 'origin/main'

This commit is contained in:
IM23a-cernik
2025-05-29 23:08:55 +02:00
6 changed files with 81 additions and 9 deletions
@@ -1,8 +1,10 @@
package net.krituximon.stalinium.item.custom;
import net.krituximon.stalinium.util.PlacedLogStorage;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.BlockPos;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.tags.BlockTags;
@@ -12,6 +14,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.AxeItem;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
@@ -127,4 +130,14 @@ public class StaliniumAxeItem extends AxeItem {
stack.setDamageValue(oldDamage);
return res;
}
@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
if(Screen.hasShiftDown()) {
tooltipComponents.add(Component.translatable("item.stalinium_axe.tooltip_shift"));
} else {
tooltipComponents.add(Component.translatable("item.stalinium_axe.tooltip"));
}
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
}
}
@@ -1,15 +1,14 @@
package net.krituximon.stalinium.item.custom;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.RandomSource;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.HoeItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.*;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
@@ -85,5 +84,15 @@ public class StaliniumHoeItem extends HoeItem {
public boolean isDamaged(ItemStack stack) {
return false;
}
@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
if(Screen.hasShiftDown()) {
tooltipComponents.add(Component.translatable("item.stalinium_hoe.tooltip_shift"));
} else {
tooltipComponents.add(Component.translatable("item.stalinium_hoe.tooltip"));
}
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
}
}
@@ -1,7 +1,9 @@
package net.krituximon.stalinium.item.custom;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.RandomSource;
@@ -10,6 +12,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.PickaxeItem;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.DropExperienceBlock;
@@ -86,4 +89,14 @@ public class StaliniumPickaxeItem extends PickaxeItem {
public boolean isDamaged(ItemStack stack) {
return false;
}
@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
if(Screen.hasShiftDown()) {
tooltipComponents.add(Component.translatable("item.stalinium_pickaxe.tooltip_shift"));
} else {
tooltipComponents.add(Component.translatable("item.stalinium_pickaxe.tooltip"));
}
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
}
}
@@ -1,6 +1,8 @@
package net.krituximon.stalinium.item.custom;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.effect.MobEffectInstance;
@@ -10,6 +12,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.ShovelItem;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
@@ -79,4 +82,14 @@ public class StaliniumShovelItem extends ShovelItem {
stack.setDamageValue(oldDamage);
return res;
}
@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
if(Screen.hasShiftDown()) {
tooltipComponents.add(Component.translatable("item.stalinium_shovel.tooltip_shift"));
} else {
tooltipComponents.add(Component.translatable("item.stalinium_shovel.tooltip"));
}
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
}
}
@@ -1,8 +1,10 @@
package net.krituximon.stalinium.item.custom;
import net.krituximon.stalinium.Stalinium;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.InteractionHand;
@@ -12,10 +14,7 @@ import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.item.UseAnim;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.*;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
@@ -102,4 +101,14 @@ public class StaliniumSwordItem extends SwordItem {
public boolean isDamaged(ItemStack stack) {
return false;
}
@Override
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
if(Screen.hasShiftDown()) {
tooltipComponents.add(Component.translatable("item.stalinium_sword.tooltip_shift"));
} else {
tooltipComponents.add(Component.translatable("item.stalinium_sword.tooltip"));
}
super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
}
}