Skip to content

Commit d9f1a9e

Browse files
SylfareSylfare
committed
fix: build errors + bug with resource pack UUID
1 parent e686ac5 commit d9f1a9e

5 files changed

Lines changed: 47 additions & 101 deletions

File tree

‎vane-core/src/main/java/org/oddlama/vane/core/commands/Vane.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ private void test_tome_generation() {
118118
loot_table.fillInventory(inventory, random, context);
119119
for (final var is : inventory.getStorageContents()) {
120120
if (is != null && is.hasItemMeta()) {
121-
final var meta = is.getItemMeta();
122-
if (meta.hasCustomModelData() && is.getItemMeta().getCustomModelData() == 0x770000) {
121+
final var modelData = is.getItemMeta().getCustomModelDataComponent().getFloats();
122+
if (!modelData.isEmpty() && modelData.getFirst() == 0x770000) {
123123
++tomes;
124124
}
125125
}

‎vane-core/src/main/java/org/oddlama/vane/core/item/ExistingItemConverter.java‎

Lines changed: 27 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -15,89 +15,40 @@
1515
import org.oddlama.vane.core.module.Context;
1616

1717
public class ExistingItemConverter extends Listener<Core> {
18-
1918
public ExistingItemConverter(final Context<Core> context) {
2019
super(context.namespace("existing_item_converter"));
2120
}
2221

2322
private CustomItem from_old_item(final ItemStack item_stack) {
24-
final var meta = item_stack.getItemMeta();
25-
if (meta == null || !meta.hasCustomModelData()) {
23+
final var modelDataList = item_stack.getItemMeta().getCustomModelDataComponent().getFloats();
24+
if (modelDataList.isEmpty() || modelDataList.getFirst() == null) {
2625
return null;
2726
}
2827

2928
// If lookups fail, we return null and nothing will be done.
30-
String new_item_key = null;
31-
if (meta.getCustomModelDataComponent().getFloats().isEmpty()) {
32-
return null;
33-
}
34-
switch (meta.getCustomModelData()) {
35-
case 7758190:
36-
new_item_key = "vane_trifles:wooden_sickle";
37-
break;
38-
case 7758191:
39-
new_item_key = "vane_trifles:stone_sickle";
40-
break;
41-
case 7758192:
42-
new_item_key = "vane_trifles:iron_sickle";
43-
break;
44-
case 7758193:
45-
new_item_key = "vane_trifles:golden_sickle";
46-
break;
47-
case 7758194:
48-
new_item_key = "vane_trifles:diamond_sickle";
49-
break;
50-
case 7758195:
51-
new_item_key = "vane_trifles:netherite_sickle";
52-
break;
53-
case 7758254: // fallthrough
54-
case 7758255: // fallthrough
55-
case 7758256: // fallthrough
56-
case 7758257: // fallthrough
57-
case 7758258: // fallthrough
58-
case 7758259:
59-
new_item_key = "vane_trifles:file";
60-
break;
61-
case 7758318:
62-
new_item_key = "vane_trifles:empty_xp_bottle";
63-
break;
64-
case 7758382:
65-
new_item_key = "vane_trifles:small_xp_bottle";
66-
break;
67-
case 7758383:
68-
new_item_key = "vane_trifles:medium_xp_bottle";
69-
break;
70-
case 7758384:
71-
new_item_key = "vane_trifles:large_xp_bottle";
72-
break;
73-
case 7758446:
74-
new_item_key = "vane_trifles:home_scroll";
75-
break;
76-
case 7758510:
77-
new_item_key = "vane_trifles:unstable_scroll";
78-
break;
79-
case 7758574:
80-
new_item_key = "vane_trifles:reinforced_elytra";
81-
break;
82-
case 7823726:
83-
new_item_key = "vane_enchantments:ancient_tome";
84-
break;
85-
case 7823727:
86-
new_item_key = "vane_enchantments:enchanted_ancient_tome";
87-
break;
88-
case 7823790:
89-
new_item_key = "vane_enchantments:ancient_tome_of_knowledge";
90-
break;
91-
case 7823791:
92-
new_item_key = "vane_enchantments:enchanted_ancient_tome_of_knowledge";
93-
break;
94-
case 7823854:
95-
new_item_key = "vane_enchantments:ancient_tome_of_the_gods";
96-
break;
97-
case 7823855:
98-
new_item_key = "vane_enchantments:enchanted_ancient_tome_of_the_gods";
99-
break;
100-
}
29+
String new_item_key = switch (modelDataList.getFirst().intValue()) {
30+
case 7758190 -> "vane_trifles:wooden_sickle";
31+
case 7758191 -> "vane_trifles:stone_sickle";
32+
case 7758192 -> "vane_trifles:iron_sickle";
33+
case 7758193 -> "vane_trifles:golden_sickle";
34+
case 7758194 -> "vane_trifles:diamond_sickle";
35+
case 7758195 -> "vane_trifles:netherite_sickle";
36+
case 7758254,7758255,7758256,7758257,7758258,7758259 -> "vane_trifles:file";
37+
case 7758318 -> "vane_trifles:empty_xp_bottle";
38+
case 7758382 -> "vane_trifles:small_xp_bottle";
39+
case 7758383 -> "vane_trifles:medium_xp_bottle";
40+
case 7758384 -> "vane_trifles:large_xp_bottle";
41+
case 7758446 -> "vane_trifles:home_scroll";
42+
case 7758510 -> "vane_trifles:unstable_scroll";
43+
case 7758574 -> "vane_trifles:reinforced_elytra";
44+
case 7823726 -> "vane_enchantments:ancient_tome";
45+
case 7823727 -> "vane_enchantments:enchanted_ancient_tome";
46+
case 7823790 -> "vane_enchantments:ancient_tome_of_knowledge";
47+
case 7823791 -> "vane_enchantments:enchanted_ancient_tome_of_knowledge";
48+
case 7823854 -> "vane_enchantments:ancient_tome_of_the_gods";
49+
case 7823855 -> "vane_enchantments:enchanted_ancient_tome_of_the_gods";
50+
default -> null;
51+
};
10152

10253
if (new_item_key == null) {
10354
return null;
@@ -146,8 +97,7 @@ private void process_inventory(@NotNull Inventory inventory) {
14697
if (
14798
meta.getCustomModelData() != custom_item.customModelData() ||
14899
is.getType() != custom_item.baseMaterial() ||
149-
key_and_version.getRight() != custom_item.version()
150-
) {
100+
key_and_version.getRight() != custom_item.version()) {
151101
// Also includes durability max update.
152102
contents[i] = custom_item.convertExistingStack(is);
153103
get_module().log.info("Updated item " + custom_item.key());
@@ -165,8 +115,7 @@ private void process_inventory(@NotNull Inventory inventory) {
165115
: custom_item.durability();
166116
if (
167117
max_damage != correct_max_damage ||
168-
meta.getPersistentDataContainer().has(DurabilityManager.ITEM_DURABILITY_DAMAGE)
169-
) {
118+
meta.getPersistentDataContainer().has(DurabilityManager.ITEM_DURABILITY_DAMAGE)) {
170119
get_module().log.info("Updated item durability " + custom_item.key());
171120
DurabilityManager.update_damage(custom_item, contents[i]);
172121
++changed;

‎vane-core/src/main/java/org/oddlama/vane/core/resourcepack/ResourcePackDistributor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class ResourcePackDistributor extends Listener<Core> {
4848

4949
public String url = null;
5050
public String sha1 = null;
51-
public UUID uuid = null;
51+
public UUID uuid = UUID.fromString("fbba121a-8f87-4e97-922d-2059777311bf");
5252
public int counter = 0;
5353

5454
// The permission to bypass the resource pack

‎vane-portals/src/main/java/org/oddlama/vane/portals/entity/FloatingItem.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraft.world.level.storage.ValueOutput;
1212
import org.bukkit.Location;
1313
import org.bukkit.World;
14+
import org.jetbrains.annotations.NotNull;
1415

1516
public class FloatingItem extends ItemEntity {
1617

@@ -69,31 +70,31 @@ public void tick() {}
6970
public void inactiveTick() {}
7071

7172
// Don't save or load
72-
7373
@Override
74-
public void readAdditionalSaveData(ValueInput output) {}
74+
public void readAdditionalSaveData(@NotNull ValueInput output) {}
7575

7676
@Override
77-
protected void addAdditionalSaveData(ValueOutput output) {}
78-
77+
protected void addAdditionalSaveData(@NotNull ValueOutput output) {}
7978

8079
@Override
81-
public boolean save(ValueOutput output) {
80+
public boolean save(@NotNull ValueOutput output) {
8281
return false;
8382
}
8483

8584
@Override
86-
public void saveWithoutId(ValueOutput output) {}
85+
public void saveWithoutId(@NotNull ValueOutput output) {}
8786

8887
@Override
89-
public void load(ValueInput output) {}
88+
public void load(@NotNull ValueInput output) {}
9089

9190
@Override
92-
public void setItem(ItemStack itemStack) {
91+
public void setItem(@NotNull ItemStack itemStack) {
9392
super.setItem(itemStack);
94-
if (itemStack.getHoverName().toFlatList().size() > 0) {
93+
if (itemStack.getHoverName().toFlatList().isEmpty()) {
94+
setCustomNameVisible(false);
95+
} else {
9596
setCustomNameVisible(true);
9697
setCustomName(itemStack.getHoverName());
97-
} else setCustomNameVisible(false);
98+
}
9899
}
99100
}

‎vane-trifles/src/main/java/org/oddlama/vane/trifles/items/SlimeBucket.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
import static org.oddlama.vane.util.PlayerUtil.give_items;
44
import static org.oddlama.vane.util.PlayerUtil.swing_arm;
55

6-
import java.io.IOException;
76
import java.util.HashSet;
7+
import java.util.List;
88
import java.util.UUID;
9-
import net.kyori.adventure.key.Key;
109
import org.bukkit.Material;
1110
import org.bukkit.Sound;
1211
import org.bukkit.SoundCategory;
@@ -24,15 +23,12 @@
2423
import org.oddlama.vane.annotation.item.VaneItem;
2524
import org.oddlama.vane.core.item.CustomItem;
2625
import org.oddlama.vane.core.module.Context;
27-
import org.oddlama.vane.core.resourcepack.ResourcePackGenerator;
2826
import org.oddlama.vane.trifles.Trifles;
29-
import org.oddlama.vane.util.StorageUtil;
3027

31-
@VaneItem(name = "slime_bucket", base = Material.SLIME_BALL, model_data = 0x760014/* and 0x760015 */, version = 1)
28+
@VaneItem(name = "slime_bucket", base = Material.SLIME_BALL, model_data = 0x760014 /* and 0x760015 */, version = 1)
3229
public class SlimeBucket extends CustomItem<Trifles> {
33-
34-
private static final int CUSTOM_MODEL_DATA_QUIET = 0x760014;
35-
private static final int CUSTOM_MODEL_DATA_JUMPY = 0x760015;
30+
private static final float CUSTOM_MODEL_DATA_QUIET = 0x760014;
31+
private static final float CUSTOM_MODEL_DATA_JUMPY = 0x760015;
3632
private HashSet<UUID> players_in_slime_chunks = new HashSet<>();
3733

3834
public SlimeBucket(Context<Trifles> context) {
@@ -69,7 +65,7 @@ public void on_player_interact_entity(final PlayerInteractEntityEvent event) {
6965
final var correct_model_data = player.getChunk().isSlimeChunk()
7066
? CUSTOM_MODEL_DATA_JUMPY
7167
: CUSTOM_MODEL_DATA_QUIET;
72-
meta.setCustomModelData(correct_model_data);
68+
meta.getCustomModelDataComponent().setFloats(List.of(correct_model_data));
7369
});
7470

7571
if (item_in_hand.getAmount() == 1) {
@@ -142,7 +138,7 @@ public void on_player_move(final PlayerMoveEvent event) {
142138
if (custom_item instanceof SlimeBucket slime_bucket && slime_bucket.enabled()) {
143139
// Update slime bucket custom model data
144140
item.editMeta(meta -> {
145-
meta.setCustomModelData(correct_model_data);
141+
meta.getCustomModelDataComponent().setFloats(List.of(correct_model_data));
146142
});
147143
}
148144
}

0 commit comments

Comments
 (0)