Mineattack/Minions
4
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Skin Improvements

Browse Source
This commit is contained in:
skippyall
2025-04-07 18:39:05 +02:00
parent 8007778c39
commit c7ff6de42b
27 changed files with 714 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/github/skippyall/minions/minion/MinionItem.java
+18 -35
View File
@@ -4,13 +4,11 @@ import eu.pb4.polymer.core.api.item.PolymerItem;
import eu.pb4.polymer.core.api.item.PolymerItemUtils;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.component.DataComponentTypes;
import net.minecraft.component.type.NbtComponent;
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.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.ActionResult;
@@ -20,14 +18,10 @@ import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext;
import java.util.List;
import java.util.Optional;
public class MinionItem extends Item implements PolymerItem {
private final boolean canProgram;
public MinionItem(Settings settings, boolean canProgram) {
public MinionItem(Settings settings) {
super(settings);
this.canProgram = canProgram;
}
@Override
@@ -49,7 +43,7 @@ public class MinionItem extends Item implements PolymerItem {
@Override
public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> tooltip, TooltipType type) {
MinionData data = stack.get(MinionData.COMPONENT);
MinionData data = getData(stack);
if(data != null) {
tooltip.add(Text.translatable("minions.minion_item.tooltip", data.name()));
}
@@ -57,46 +51,35 @@ public class MinionItem extends Item implements PolymerItem {
@Override
public ActionResult useOnBlock(ItemUsageContext context) {
String contents = context.getStack().getName().getLiteralString();
String name;
if(contents != null && contents.length() <= 16) {
name = contents;
} else {
name = "Minion";
}
if(!context.getWorld().isClient) {
MinionData data = getData(context.getStack());
if(data == null) {
data = new MinionData(null, name, Optional.empty());
}
if (data.uuid() == null) {
MinionFakePlayer.createMinion(data, (ServerWorld) context.getWorld(), (ServerPlayerEntity) context.getPlayer(), canProgram, context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
}else {
data = data.withName(name);
MinionFakePlayer.spawnMinionAt(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
MinionPersistentState.INSTANCE.addMinion(data);
}
MinionData data = getDataOrDefault(context.getStack());
MinionFakePlayer.spawnMinion(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0));
}
context.getStack().decrement(1);
return ActionResult.SUCCESS;
}
public static void setData(MinionData data, ItemStack item) {
item.set(MinionData.COMPONENT, data);
item.set(MinionData.COMPONENT, data.uuid());
}
@Nullable
public static MinionData getData(ItemStack item) {
return item.get(MinionData.COMPONENT);
if(item.contains(MinionData.COMPONENT)) {
return MinionPersistentState.INSTANCE.getMinionData(item.get(MinionData.COMPONENT));
}
return null;
}
public static MinionData getDataOrDefault(ItemStack item) {
MinionData data = getData(item);
if(data == null) {
data = MinionData.createDefault();
}
return data;
}
public static boolean containsData(ItemStack item) {
NbtComponent nbt = item.get(DataComponentTypes.CUSTOM_DATA);
if (nbt == null) {
return false;
}
return nbt.copyNbt().contains("data");
return item.contains(MinionData.COMPONENT);
}
}