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

Merge branch 'master' into fork/Boy0000/nms-packets

Browse Source
This commit is contained in:
LoJoSho
2025-06-26 10:10:28 -05:00
parent 5d66e97101 26c2a6480c
commit 7abb884d30
10 changed files with 516 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/me/lojosho/hibiscuscommons/config/serializer/ItemSerializer.java
View File

@@ -150,7 +150,9 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
if (!itemFlagsNode.virtual()) {
itemMeta.setAttributeModifiers(item.getType().getDefaultAttributeModifiers());
if (HibiscusCommonsPlugin.isOnPaper() && NMSHandlers.getVersion().isHigherOrEqual(MinecraftVersion.v1_20_6)) {
itemMeta.setAttributeModifiers(item.getType().getDefaultAttributeModifiers());
}
for (String itemFlag : itemFlagsNode.getList(String.class)) {
if (!EnumUtils.isValidEnum(ItemFlag.class, itemFlag)) continue;
//MessagesUtil.sendDebugMessages("Added " + itemFlag + " to the item!");

2
common/src/main/java/me/lojosho/hibiscuscommons/hooks/Hooks.java
View File

@@ -1,5 +1,6 @@
package me.lojosho.hibiscuscommons.hooks;
import lombok.Getter;
import me.clip.placeholderapi.PlaceholderAPI;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import me.lojosho.hibiscuscommons.HibiscusCommonsPlugin;
@@ -44,6 +45,7 @@ public class Hooks {
private static final HookPremiumVanish PREMIUM_VANISH_HOOK = new HookPremiumVanish();
private static final HookSuperVanish SUPER_VANISH_HOOK = new HookSuperVanish();
@Getter
private static boolean allHooksActive = false;
public static Hook getHook(@NotNull String id) {

1
common/src/main/java/me/lojosho/hibiscuscommons/nms/MinecraftVersion.java
View File

@@ -10,6 +10,7 @@ public enum MinecraftVersion {
v1_21_3,
v1_21_4,
v1_21_5,
v1_21_6,
;
public boolean isHigher(MinecraftVersion other) {

1
common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSHandlers.java
View File

@@ -19,6 +19,7 @@ public class NMSHandlers {
put(MinecraftVersion.v1_21_3, "v1_21_R2");
put(MinecraftVersion.v1_21_4, "v1_21_R3");
put(MinecraftVersion.v1_21_5, "v1_21_R4");
put(MinecraftVersion.v1_21_6, "v1_21_R5");
}};
private static NMSHandler handler;