Port to 1.21.5

This commit is contained in:
skippyall
2025-04-25 13:53:11 +02:00
parent cdd0a594f3
commit 935b2225c9
24 changed files with 95 additions and 112 deletions
@@ -1,45 +1,38 @@
package io.github.skippyall.minions.minion;
import com.mojang.serialization.Codec;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.nbt.NbtList;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.PersistentState;
import net.minecraft.world.PersistentStateType;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
public class MinionPersistentState extends PersistentState {
public static Type<MinionPersistentState> TYPE = new Type<>(MinionPersistentState::new, MinionPersistentState::read, null);
public static final Codec<MinionPersistentState> CODEC = MinionData.CODEC.listOf().xmap(MinionPersistentState::new, MinionPersistentState::getMinionDataList);
public static PersistentStateType<MinionPersistentState> TYPE = new PersistentStateType<>("minion", MinionPersistentState::new, MinionPersistentState.CODEC, null);
public static MinionPersistentState INSTANCE;
private final Map<UUID, MinionData> minionData = new HashMap<>();
@Override
public NbtCompound writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
NbtList list = new NbtList();
for(MinionData data : minionData.values()) {
list.add(data.writeNbt());
}
nbt.put("minions", list);
public MinionPersistentState() {
return nbt;
}
public static MinionPersistentState read(NbtCompound compound, RegistryWrapper.WrapperLookup lookup) {
NbtList list = compound.getList("minions", NbtElement.COMPOUND_TYPE);
MinionPersistentState instance = new MinionPersistentState();
for(NbtElement element : list) {
if(element instanceof NbtCompound compound1) {
MinionData data = MinionData.readNbt(compound1);
instance.minionData.put(data.uuid(), data);
}
public MinionPersistentState(List<MinionData> dataList) {
for (MinionData data : dataList) {
minionData.put(data.uuid(), data);
}
return instance;
}
public MinionData getMinionData(UUID uuid) {
@@ -50,6 +43,10 @@ public class MinionPersistentState extends PersistentState {
return minionData;
}
public List<MinionData> getMinionDataList() {
return List.copyOf(minionData.values());
}
public void updateMinionData(MinionData data) {
minionData.put(data.uuid(), data);
markDirty();
@@ -64,6 +61,6 @@ public class MinionPersistentState extends PersistentState {
}
public static void create(MinecraftServer server) {
INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE, "minion");
INSTANCE = server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE);
}
}