Upgrade back to 1.19.4

Increment API version
+ LibAC
- Lightmans Currency
- Parchment (Temporary)
This commit is contained in:
Aria 2023-04-21 03:44:40 -07:00
parent 00ea4681d8
commit c6ff1afbdc
16 changed files with 99 additions and 32 deletions

View file

@ -5,7 +5,6 @@ import java.util.UUID;
import dev.zontreck.libzontreck.LibZontreck;
import dev.zontreck.libzontreck.chat.ChatColor;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
@ -78,9 +77,9 @@ public class ChatHelpers {
* @param inputs Entries to replace with in input
* @return
*/
public static TextComponent macro(String input, String... inputs)
public static Component macro(String input, String... inputs)
{
return new TextComponent(macroize(input,inputs));
return Component.literal(macroize(input,inputs));
}
/**
* Returns the output with colors applied, and chat entries replaced using [number] as the format

View file

@ -2,6 +2,7 @@ package dev.zontreck.libzontreck.util;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import net.minecraft.core.Registry;
@ -11,25 +12,30 @@ import net.minecraft.nbt.Tag;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraftforge.registries.ForgeRegistries;
public class ItemUtils {
public static Map<Enchantment, Integer> getEnchantments(ItemStack stack)
{
ListTag enchants = stack.getEnchantmentTags();
Map<Enchantment, Integer> enchantments = new HashMap<>();
//ListTag enchants = stack.getEnchantmentTags();
Map<Enchantment, Integer> enchantments = EnchantmentHelper.getEnchantments(stack);
return enchantments;
/*Map<Enchantment, Integer> enchantments = new HashMap<>();
Iterator<Tag> enchantsIterator = enchants.iterator();
while(enchantsIterator.hasNext())
{
CompoundTag theTag = (CompoundTag)enchantsIterator.next();
Enchantment ench = Registry.ENCHANTMENT.getOptional(EnchantmentHelper.getEnchantmentId(theTag)).get();
Enchantment enchant = EnchantmentHelper.
Enchantment ench = .getOptional(EnchantmentHelper.getEnchantmentId(theTag)).get();
Integer level = EnchantmentHelper.getEnchantmentLevel(theTag);
enchantments.put(ench, level);
}
return enchantments;
return enchantments;*/
}
public static Integer getEnchantmentLevel(Enchantment ench, ItemStack stack)

View file

@ -4,7 +4,7 @@ import dev.zontreck.libzontreck.chat.ChatColor;
import dev.zontreck.libzontreck.lore.LoreContainer;
import dev.zontreck.libzontreck.lore.LoreEntry;
import dev.zontreck.libzontreck.util.heads.HeadCache.HeadCacheItem;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.ItemStack;
public class CreditsEntry {
@ -27,7 +27,7 @@ public class CreditsEntry {
public ItemStack compile()
{
ItemStack stack = player.getAsItem();
stack.setHoverName(new TextComponent(name));
stack.setHoverName(Component.literal(name));
LoreContainer contain = new LoreContainer(stack);
LoreEntry entry = new LoreEntry();
entry.text = ChatColor.doColors("!Dark_Purple!Role: "+role);

View file

@ -12,7 +12,7 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.NbtIo;
import net.minecraft.nbt.Tag;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.PlayerHeadItem;
@ -66,7 +66,7 @@ public class HeadCache
skullOwner.put("Properties", properties);
head.addTagElement(PlayerHeadItem.TAG_SKULL_OWNER, skullOwner);
TextComponent headname = ChatHelpers.macro("[0]'s Head", name);
Component headname = ChatHelpers.macro("[0]'s Head", name);
head.setHoverName(headname);
return head;