Repo-Mirror/HibiscusCommons
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HibiscusCommons.git synced 2025-12-19 15:09:26 +00:00
Code Issues Releases Activity

fix: potions not having POTION_CONTENTS to set color

Browse Source
This commit is contained in:
LoJoSho
2025-07-02 12:10:36 -05:00
parent 482cb5e54d
commit 24a51684ba
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSUtils.java
View File

@@ -5,17 +5,23 @@ import io.netty.channel.ChannelPipeline;
import net.minecraft.core.component.DataComponents; import net.minecraft.core.component.DataComponents;
import net.minecraft.network.Connection; import net.minecraft.network.Connection;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.item.alchemy.PotionContents;
import net.minecraft.world.item.component.DyedItemColor; import net.minecraft.world.item.component.DyedItemColor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.inventory.CraftItemStack;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.PotionMeta;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.List;
import java.util.Optional;
public class NMSUtils extends NMSCommon implements me.lojosho.hibiscuscommons.nms.NMSUtils { public class NMSUtils extends NMSCommon implements me.lojosho.hibiscuscommons.nms.NMSUtils {
@Override @Override
@@ -42,8 +48,17 @@ public class NMSUtils extends NMSCommon implements me.lojosho.hibiscuscommons.nm
} }
@Override @Override
public ItemStack setColor(@NotNull ItemStack itemStack, Color color) { public ItemStack setColor(@NotNull ItemStack itemStack, @NotNull Color color) {
net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack); net.minecraft.world.item.ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
// Potions needs a bit extra to get the color working properly
if (itemStack.getType() == Material.POTION) {
nmsStack.set(DataComponents.POTION_CONTENTS, new PotionContents(
Optional.empty(),
Optional.of(color.asRGB()),
List.of(),
Optional.empty())
);
}
nmsStack.set(DataComponents.DYED_COLOR, new DyedItemColor(color.asRGB())); nmsStack.set(DataComponents.DYED_COLOR, new DyedItemColor(color.asRGB()));
return CraftItemStack.asBukkitCopy(nmsStack); return CraftItemStack.asBukkitCopy(nmsStack);
} }