Skip to content

Commit eaff176

Browse files
mcmonkey4evamcmonkey4eva
committed
1.21.5 part 3: compiler fixes
with a few todo holes
1 parent cc76fad commit eaff176

File tree

23 files changed

+117
-142
lines changed

23 files changed

+117
-142
lines changed

‎plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/ItemHelper.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ public ItemStack setRawComponentsPatch(ItemStack item, MapTag rawComponentsMap,
131131

132132
public abstract void setInventoryItem(Inventory inventory, ItemStack item, int slot);
133133

134-
public abstract IntArrayTag convertUuidToNbt(UUID id);
135-
136-
public abstract UUID convertNbtToUuid(IntArrayTag id);
137-
138134
public abstract String getDisplayName(ItemTag item);
139135

140136
public abstract List<String> getLore(ItemTag item);

‎v1_17/src/main/java/com/denizenscript/denizen/nms/v1_17/helpers/ItemHelperImpl.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,16 +245,6 @@ public void setInventoryItem(Inventory inventory, ItemStack item, int slot) {
245245
}
246246
}
247247

248-
@Override
249-
public IntArrayTag convertUuidToNbt(UUID id) {
250-
return new IntArrayTag(NbtUtils.createUUID(id).getAsIntArray());
251-
}
252-
253-
@Override
254-
public UUID convertNbtToUuid(IntArrayTag id) {
255-
return NbtUtils.loadUUID(new net.minecraft.nbt.IntArrayTag(id.getValue()));
256-
}
257-
258248
@Override
259249
public String getDisplayName(ItemTag item) {
260250
if (!item.getItemMeta().hasDisplayName()) {

‎v1_18/src/main/java/com/denizenscript/denizen/nms/v1_18/helpers/ItemHelperImpl.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,6 @@ public void setInventoryItem(Inventory inventory, ItemStack item, int slot) {
242242
}
243243
}
244244

245-
@Override
246-
public IntArrayTag convertUuidToNbt(UUID id) {
247-
return new IntArrayTag(NbtUtils.createUUID(id).getAsIntArray());
248-
}
249-
250-
@Override
251-
public UUID convertNbtToUuid(IntArrayTag id) {
252-
return NbtUtils.loadUUID(new net.minecraft.nbt.IntArrayTag(id.getValue()));
253-
}
254-
255245
@Override
256246
public String getDisplayName(ItemTag item) {
257247
if (!item.getItemMeta().hasDisplayName()) {

‎v1_19/src/main/java/com/denizenscript/denizen/nms/v1_19/helpers/ItemHelperImpl.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,16 +246,6 @@ public void setInventoryItem(Inventory inventory, ItemStack item, int slot) {
246246
}
247247
}
248248

249-
@Override
250-
public IntArrayTag convertUuidToNbt(UUID id) {
251-
return new IntArrayTag(NbtUtils.createUUID(id).getAsIntArray());
252-
}
253-
254-
@Override
255-
public UUID convertNbtToUuid(IntArrayTag id) {
256-
return NbtUtils.loadUUID(new net.minecraft.nbt.IntArrayTag(id.getValue()));
257-
}
258-
259249
@Override
260250
public String getDisplayName(ItemTag item) {
261251
if (!item.getItemMeta().hasDisplayName()) {

‎v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/helpers/ItemHelperImpl.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -443,16 +443,6 @@ public void setInventoryItem(Inventory inventory, ItemStack item, int slot) {
443443
}
444444
}
445445

446-
@Override
447-
public IntArrayTag convertUuidToNbt(UUID id) {
448-
return new IntArrayTag(NbtUtils.createUUID(id).getAsIntArray());
449-
}
450-
451-
@Override
452-
public UUID convertNbtToUuid(IntArrayTag id) {
453-
return NbtUtils.loadUUID(new net.minecraft.nbt.IntArrayTag(id.getValue()));
454-
}
455-
456446
@Override
457447
public String getDisplayName(ItemTag item) {
458448
if (!item.getItemMeta().hasDisplayName()) {

‎v1_21/src/main/java/com/denizenscript/denizen/nms/v1_21/Handler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public void undisableAsyncCatcher() {
144144

145145
@Override
146146
public boolean isCorrectMappingsCode() {
147-
return CraftMagicNumbers.INSTANCE.getMappingsVersion().equals("60ac387ca8007aa018e6aeb394a6988c");
147+
return CraftMagicNumbers.INSTANCE.getMappingsVersion().equals("7ecad754373a5fbc43d381d7450c53a5");
148148
}
149149

150150
@Override
@@ -160,7 +160,7 @@ public CompoundTag createCompoundTag(Map<String, Tag> value) {
160160
@Override
161161
public CompoundTag parseSNBT(String snbt) {
162162
try {
163-
return CompoundTagImpl.fromNMSTag(TagParser.parseTag(snbt));
163+
return CompoundTagImpl.fromNMSTag(TagParser.parseCompoundFully(snbt));
164164
}
165165
catch (CommandSyntaxException e) {
166166
return null;
@@ -349,7 +349,7 @@ public boolean containerHas(PersistentDataContainer container, String key) {
349349
public String containerGetString(PersistentDataContainer container, String key) {
350350
net.minecraft.nbt.Tag base = ((CraftPersistentDataContainer) container).getRaw().get(key);
351351
if (base instanceof StringTag) {
352-
return base.getAsString();
352+
return base.asString().get();
353353
}
354354
else if (base instanceof ByteArrayTag) {
355355
return new String(((ByteArrayTag) base).getAsByteArray(), StandardCharsets.UTF_8);

‎v1_21/src/main/java/com/denizenscript/denizen/nms/v1_21/ReflectionMappingsInfo.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,35 @@ public class ReflectionMappingsInfo {
55
// Content generated by ReflectionMappingsGenerator - https://github.com/DenizenScript/ReflectionMappingsGenerator
66

77
// net.minecraft.world.level.block.state.BlockBehaviour
8-
public static String BlockBehaviour_explosionResistance = "aI";
8+
public static String BlockBehaviour_explosionResistance = "G";
99

1010
// net.minecraft.core.MappedRegistry
1111
public static String MappedRegistry_frozen = "l";
1212
public static String MappedRegistry_unregisteredIntrusiveHolders = "m";
1313

1414
// net.minecraft.world.entity.Entity
15-
public static String Entity_onGround = "aD";
15+
public static String Entity_onGround = "aH";
1616
public static String Entity_DATA_SHARED_FLAGS_ID = "am";
17-
public static String Entity_DATA_CUSTOM_NAME = "aO";
18-
public static String Entity_DATA_CUSTOM_NAME_VISIBLE = "aP";
17+
public static String Entity_DATA_CUSTOM_NAME = "aR";
18+
public static String Entity_DATA_CUSTOM_NAME_VISIBLE = "aS";
1919

2020
// net.minecraft.world.entity.LivingEntity
2121
public static String LivingEntity_attackStrengthTicker = "aS";
22-
public static String LivingEntity_autoSpinAttackTicks = "bB";
22+
public static String LivingEntity_autoSpinAttackTicks = "bp";
2323
public static String LivingEntity_setLivingEntityFlag_method = "c";
2424

2525
// net.minecraft.world.entity.player.Player
26-
public static String Player_DATA_PLAYER_ABSORPTION_ID = "d";
27-
public static String Player_DATA_PLAYER_MODE_CUSTOMISATION = "bW";
26+
public static String Player_DATA_PLAYER_ABSORPTION_ID = "c";
27+
public static String Player_DATA_PLAYER_MODE_CUSTOMISATION = "bK";
2828

2929
// net.minecraft.server.level.ServerPlayer
30-
public static String ServerPlayer_respawnForced = "dn";
30+
public static String ServerPlayer_respawnConfig = "dc";
3131

3232
// net.minecraft.world.entity.monster.EnderMan
33-
public static String EnderMan_DATA_CREEPY = "cb";
33+
public static String EnderMan_DATA_CREEPY = "bJ";
3434

3535
// net.minecraft.world.entity.monster.Zombie
36-
public static String Zombie_inWaterTime = "cm";
36+
public static String Zombie_inWaterTime = "bY";
3737

3838
// net.minecraft.world.item.Item
3939
public static String Item_components = "c";
@@ -48,7 +48,7 @@ public class ReflectionMappingsInfo {
4848
public static String ThreadedLevelLightEngineTaskType_PRE_UPDATE = "a";
4949

5050
// net.minecraft.world.entity.ExperienceOrb
51-
public static String ExperienceOrb_age = "f";
51+
public static String ExperienceOrb_age = "k";
5252

5353
// net.minecraft.world.entity.item.ItemEntity
5454
public static String ItemEntity_DATA_ITEM = "c";
@@ -121,8 +121,9 @@ public class ReflectionMappingsInfo {
121121
public static String ServerLevel_sleepStatus = "Q";
122122

123123
// net.minecraft.world.item.AdventureModePredicate
124-
public static String AdventureModePredicate_predicates = "h";
124+
public static String AdventureModePredicate_predicates = "f";
125125

126126
// net.minecraft.stats.ServerRecipeBook
127127
public static String ServerRecipeBook_addHighlight_method = "e";
128+
128129
}

‎v1_21/src/main/java/com/denizenscript/denizen/nms/v1_21/helpers/AdvancementHelperImpl.java‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.md_5.bungee.api.ChatColor;
88
import net.minecraft.advancements.*;
99
import net.minecraft.advancements.critereon.ImpossibleTrigger;
10+
import net.minecraft.core.ClientAsset;
1011
import net.minecraft.network.protocol.game.ClientboundUpdateAdvancementsPacket;
1112
import net.minecraft.resources.ResourceLocation;
1213
import net.minecraft.server.PlayerAdvancements;
@@ -55,8 +56,7 @@ public void register(com.denizenscript.denizen.nms.util.Advancement advancement)
5556
}
5657
advancement.registered = true;
5758
if (!advancement.hidden && advancement.parent != null) {
58-
PacketHelperImpl.broadcast(new ClientboundUpdateAdvancementsPacket(false,
59-
List.of(nmsAdvancementHolder), Set.of(), Map.of()));
59+
PacketHelperImpl.broadcast(new ClientboundUpdateAdvancementsPacket(false, List.of(nmsAdvancementHolder), Set.of(), Map.of(), false));
6060
}
6161
}
6262

@@ -76,7 +76,7 @@ public void unregister(com.denizenscript.denizen.nms.util.Advancement advancemen
7676
getNMSAdvancementManager().advancements = mapBuilder.build();
7777
getNMSAdvancementManager().tree().remove(Set.of(nmsKey));
7878
advancement.registered = false;
79-
PacketHelperImpl.broadcast(new ClientboundUpdateAdvancementsPacket(false, List.of(), Set.of(nmsKey), Map.of()));
79+
PacketHelperImpl.broadcast(new ClientboundUpdateAdvancementsPacket(false, List.of(), Set.of(nmsKey), Map.of(), false));
8080
}
8181

8282
@Override
@@ -92,10 +92,7 @@ public void grantPartial(com.denizenscript.denizen.nms.util.Advancement advancem
9292
for (int i = 0; i < len; i++) {
9393
progress.grantProgress(IMPOSSIBLE_KEY + i); // complete impossible criteria
9494
}
95-
PacketHelperImpl.send(player, new ClientboundUpdateAdvancementsPacket(false,
96-
Collections.singleton(nmsAdvancement),
97-
Collections.emptySet(),
98-
Collections.singletonMap(nmsAdvancement.id(), progress)));
95+
PacketHelperImpl.send(player, new ClientboundUpdateAdvancementsPacket(false, List.of(nmsAdvancement), Set.of(), Map.of(nmsAdvancement.id(), progress), false));
9996
}
10097
else {
10198
AdvancementHolder nmsAdvancement = getNMSAdvancementManager().advancements.get(CraftNamespacedKey.toMinecraft(advancement.key));
@@ -116,10 +113,7 @@ public void grant(com.denizenscript.denizen.nms.util.Advancement advancement, Pl
116113
AdvancementProgress progress = new AdvancementProgress();
117114
progress.update(new AdvancementRequirements(IMPOSSIBLE_REQUIREMENTS));
118115
progress.grantProgress(IMPOSSIBLE_KEY); // complete impossible criteria
119-
PacketHelperImpl.send(player, new ClientboundUpdateAdvancementsPacket(false,
120-
Collections.singleton(nmsAdvancement),
121-
Collections.emptySet(),
122-
Collections.singletonMap(nmsAdvancement.id(), progress)));
116+
PacketHelperImpl.send(player, new ClientboundUpdateAdvancementsPacket(false, List.of(nmsAdvancement), Set.of(), Map.of(nmsAdvancement.id(), progress), false));
123117
}
124118
else {
125119
AdvancementHolder nmsAdvancement = getNMSAdvancementManager().advancements.get(CraftNamespacedKey.toMinecraft(advancement.key));
@@ -130,10 +124,7 @@ public void grant(com.denizenscript.denizen.nms.util.Advancement advancement, Pl
130124
@Override
131125
public void revoke(com.denizenscript.denizen.nms.util.Advancement advancement, Player player) {
132126
if (advancement.temporary) {
133-
PacketHelperImpl.send(player, new ClientboundUpdateAdvancementsPacket(false,
134-
Collections.emptySet(),
135-
Collections.singleton(CraftNamespacedKey.toMinecraft(advancement.key)),
136-
Collections.emptyMap()));
127+
PacketHelperImpl.send(player, new ClientboundUpdateAdvancementsPacket(false, List.of(), Set.of(CraftNamespacedKey.toMinecraft(advancement.key)), Map.of(), false));
137128
}
138129
else {
139130
AdvancementHolder nmsAdvancement = getNMSAdvancementManager().advancements.get(CraftNamespacedKey.toMinecraft(advancement.key));
@@ -143,15 +134,13 @@ public void revoke(com.denizenscript.denizen.nms.util.Advancement advancement, P
143134

144135
@Override
145136
public void update(Player player) {
137+
// TODO: 1.21.5: should showAdvancements be true?
146138
ServerPlayer nmsPlayer = ((CraftPlayer) player).getHandle();
147-
nmsPlayer.connection.send(new ClientboundUpdateAdvancementsPacket(true,
148-
Collections.emptySet(),
149-
Collections.emptySet(),
150-
Collections.emptyMap()));
139+
nmsPlayer.connection.send(new ClientboundUpdateAdvancementsPacket(true, List.of(), Set.of(), Map.of(), false));
151140
PlayerAdvancements data = nmsPlayer.getAdvancements();
152141
data.save(); // save progress
153142
data.reload(getNMSAdvancementManager()); // clear progress
154-
data.flushDirty(nmsPlayer); // load progress and update client
143+
data.flushDirty(nmsPlayer, false); // load progress and update client
155144
}
156145

157146
private static AdvancementHolder asNMSCopy(com.denizenscript.denizen.nms.util.Advancement advancement) {
@@ -160,7 +149,7 @@ private static AdvancementHolder asNMSCopy(com.denizenscript.denizen.nms.util.Ad
160149
: null;
161150
DisplayInfo display = new DisplayInfo(CraftItemStack.asNMSCopy(advancement.icon),
162151
Handler.componentToNMS(FormattedTextHelper.parse(advancement.title, ChatColor.WHITE)), Handler.componentToNMS(FormattedTextHelper.parse(advancement.description, ChatColor.WHITE)),
163-
Optional.ofNullable(advancement.background).map(CraftNamespacedKey::toMinecraft), AdvancementType.valueOf(advancement.frame.name()),
152+
Optional.ofNullable(advancement.background).map(CraftNamespacedKey::toMinecraft).map(ClientAsset::new), AdvancementType.valueOf(advancement.frame.name()),
164153
advancement.toast, advancement.announceToChat, advancement.hidden);
165154
display.setLocation(advancement.xOffset, advancement.yOffset);
166155
Map<String, Criterion<?>> criteria = IMPOSSIBLE_CRITERIA;

‎v1_21/src/main/java/com/denizenscript/denizen/nms/v1_21/helpers/BlockHelperImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import net.minecraft.core.BlockPos;
1717
import net.minecraft.server.level.ServerLevel;
1818
import net.minecraft.util.InclusiveRange;
19-
import net.minecraft.util.random.SimpleWeightedRandomList;
19+
import net.minecraft.util.random.WeightedList;
2020
import net.minecraft.world.entity.Entity;
2121
import net.minecraft.world.item.component.ResolvableProfile;
2222
import net.minecraft.world.level.BaseSpawner;
@@ -249,7 +249,7 @@ public void setSpawnerCustomRules(CreatureSpawner spawner, int skyMin, int skyMa
249249
SpawnData toSpawn = nmsSpawner.nextSpawnData;
250250
SpawnData.CustomSpawnRules rules = skyMin == -1 ? null : new SpawnData.CustomSpawnRules(new InclusiveRange<>(skyMin, skyMax), new InclusiveRange<>(blockMin, blockMax));
251251
nmsSpawner.nextSpawnData = new SpawnData(toSpawn.entityToSpawn(), Optional.ofNullable(rules), toSpawn.equipment());
252-
nmsSpawner.spawnPotentials = SimpleWeightedRandomList.empty();
252+
nmsSpawner.spawnPotentials = WeightedList.of();
253253
}
254254
catch (Throwable ex) {
255255
Debug.echoError(ex);

‎v1_21/src/main/java/com/denizenscript/denizen/nms/v1_21/helpers/EntityDataNameMapper.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
import net.minecraft.world.entity.animal.horse.AbstractHorse;
1515
import net.minecraft.world.entity.animal.horse.Horse;
1616
import net.minecraft.world.entity.animal.horse.Llama;
17+
import net.minecraft.world.entity.animal.sheep.Sheep;
1718
import net.minecraft.world.entity.animal.sniffer.Sniffer;
19+
import net.minecraft.world.entity.animal.wolf.Wolf;
1820
import net.minecraft.world.entity.boss.enderdragon.EndCrystal;
1921
import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
2022
import net.minecraft.world.entity.boss.wither.WitherBoss;

0 commit comments

Comments
 (0)