Mojang Mappings

This commit is contained in:
skippyall
2026-04-29 08:51:37 +02:00
parent cc9fedd63b
commit f5202a4264
140 changed files with 1646 additions and 1675 deletions
@@ -5,35 +5,35 @@ import eu.pb4.polymer.core.api.item.PolymerItemUtils;
import io.github.skippyall.minions.gui.MinionLookGui;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionComponentTypes;
import net.minecraft.component.DataComponentTypes;
import net.minecraft.component.type.TooltipDisplayComponent;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.item.Items;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.Vec2f;
import net.minecraft.world.World;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.component.TooltipDisplay;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec2;
import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext;
import java.util.function.Consumer;
public class MinionItem extends Item implements PolymerItem {
public MinionItem(Settings settings) {
public MinionItem(Properties settings) {
super(settings);
}
@Override
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context) {
public @Nullable ResourceLocation getPolymerItemModel(ItemStack stack, PacketContext context) {
return null;
}
@@ -43,39 +43,39 @@ public class MinionItem extends Item implements PolymerItem {
}
@Override
public ItemStack getPolymerItemStack(ItemStack stack, TooltipType tooltipType, PacketContext player) {
public ItemStack getPolymerItemStack(ItemStack stack, TooltipFlag tooltipType, PacketContext player) {
ItemStack out = PolymerItemUtils.createItemStack(stack, tooltipType, player);
out.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true);
out.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true);
return out;
}
@Override
public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent component, Consumer<Text> tooltip, TooltipType type) {
public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay component, Consumer<Component> tooltip, TooltipFlag type) {
MinionData data = null /*getData(stack)*/;
if(data != null) {
tooltip.accept(Text.translatable("minions.minion_item.tooltip", data.name()));
tooltip.accept(Component.translatable("minions.minion_item.tooltip", data.name()));
}
}
@Override
public ActionResult use(World world, PlayerEntity user, Hand hand) {
if(user instanceof ServerPlayerEntity serverPlayer) {
ItemStack stack = user.getStackInHand(hand);
public InteractionResult use(Level world, Player user, InteractionHand hand) {
if(user instanceof ServerPlayer serverPlayer) {
ItemStack stack = user.getItemInHand(hand);
MinionLookGui.open(serverPlayer, stack);
return ActionResult.SUCCESS;
return InteractionResult.SUCCESS;
}
return ActionResult.SUCCESS_SERVER;
return InteractionResult.SUCCESS_SERVER;
}
@Override
public ActionResult useOnBlock(ItemUsageContext context) {
if(!context.getWorld().isClient) {
MinionData data = getDataOrDefault(context.getWorld().getServer(), context.getStack());
MinionFakePlayer.spawnMinion(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
public InteractionResult useOn(UseOnContext context) {
if(!context.getLevel().isClientSide) {
MinionData data = getDataOrDefault(context.getLevel().getServer(), context.getItemInHand());
MinionFakePlayer.spawnMinion(data, (ServerLevel) context.getLevel(), context.getClickedPos().getCenter().add(0,0.5,0), new Vec2(0, 0));
}
context.getStack().decrement(1);
return ActionResult.SUCCESS;
context.getItemInHand().shrink(1);
return InteractionResult.SUCCESS;
}
public static void setData(MinecraftServer server, MinionData data, ItemStack item) {
@@ -85,7 +85,7 @@ public class MinionItem extends Item implements PolymerItem {
@Nullable
public static MinionData getData(MinecraftServer server, ItemStack item) {
if(item.contains(MinionComponentTypes.MINION_DATA)) {
if(item.has(MinionComponentTypes.MINION_DATA)) {
return MinionPersistentState.get(server).getMinionData(item.get(MinionComponentTypes.MINION_DATA));
}
return null;
@@ -101,6 +101,6 @@ public class MinionItem extends Item implements PolymerItem {
}
public static boolean containsData(ItemStack item) {
return item.contains(MinionComponentTypes.MINION_DATA);
return item.has(MinionComponentTypes.MINION_DATA);
}
}