From 87a08fd9ba8dcd90bc181f4e5f9a990ec4afaa9d Mon Sep 17 00:00:00 2001 From: Nightenom <17338378+Nightenom@users.noreply.github.com> Date: Wed, 7 Feb 2024 14:59:32 +0100 Subject: [PATCH] some registry/network leftovers --- src/main/java/com/minecolonies/api/util/CraftingUtils.java | 2 +- src/main/java/com/minecolonies/api/util/SoundUtils.java | 4 ++-- .../com/minecolonies/core/client/gui/WindowBannerPicker.java | 4 ++-- .../core/client/gui/townhall/WindowTownHallColonyManage.java | 2 +- .../client/render/worldevent/ColonyBlueprintRenderer.java | 2 +- .../minecolonies/core/entity/ai/minimal/EntityAISickTask.java | 2 +- .../com/minecolonies/core/items/ItemScepterBeekeeper.java | 2 +- .../core/network/messages/client/VanillaParticleMessage.java | 2 +- .../minecolonies/core/tileentities/TileEntityColonyFlag.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/minecolonies/api/util/CraftingUtils.java b/src/main/java/com/minecolonies/api/util/CraftingUtils.java index 4a2275f22c0..eb3fa44ed1a 100755 --- a/src/main/java/com/minecolonies/api/util/CraftingUtils.java +++ b/src/main/java/com/minecolonies/api/util/CraftingUtils.java @@ -183,7 +183,7 @@ public static void forEachCreativeTabItems(@NotNull final CreativeModeTab.ItemDi final HolderLookup.RegistryLookup registry = displayParams.holders().lookup(Registries.CREATIVE_MODE_TAB).get(); final Map> tabKeys = registry.listElements() .distinct() // some mods are dumb - .collect(Collectors.toMap(Holder::get, Holder.Reference::key)); + .collect(Collectors.toMap(Holder::value, Holder.Reference::key)); for (final CreativeModeTab tab : CreativeModeTabs.allTabs()) { diff --git a/src/main/java/com/minecolonies/api/util/SoundUtils.java b/src/main/java/com/minecolonies/api/util/SoundUtils.java index 1a27ced63b1..6daac6d6209 100755 --- a/src/main/java/com/minecolonies/api/util/SoundUtils.java +++ b/src/main/java/com/minecolonies/api/util/SoundUtils.java @@ -204,7 +204,7 @@ public static void playSuccessSound(@NotNull final Player player, @NotNull final } else { - player.playNotifySound(SoundEvents.NOTE_BLOCK_BELL.get(), SoundSource.NEUTRAL, 1.0f, 1.0f); + player.playNotifySound(SoundEvents.NOTE_BLOCK_BELL.value(), SoundSource.NEUTRAL, 1.0f, 1.0f); } } @@ -228,7 +228,7 @@ public static void playErrorSound(@NotNull final Player player, @NotNull final B } else { - player.playNotifySound(SoundEvents.NOTE_BLOCK_DIDGERIDOO.get(), SoundSource.NEUTRAL, 1.0f, 0.3f); + player.playNotifySound(SoundEvents.NOTE_BLOCK_DIDGERIDOO.value(), SoundSource.NEUTRAL, 1.0f, 0.3f); } } diff --git a/src/main/java/com/minecolonies/core/client/gui/WindowBannerPicker.java b/src/main/java/com/minecolonies/core/client/gui/WindowBannerPicker.java index f88352b1a64..1776ba675fc 100644 --- a/src/main/java/com/minecolonies/core/client/gui/WindowBannerPicker.java +++ b/src/main/java/com/minecolonies/core/client/gui/WindowBannerPicker.java @@ -490,7 +490,7 @@ public PatternButton(int x, int y, int height, Holder pattern) int tempIndex = 0; for (final Holder pat : WindowBannerPicker.this.patterns) { - if (pat.get().getHashname().equals(pattern.get().getHashname())) + if (pat.value().getHashname().equals(pattern.value().getHashname())) { this.index = tempIndex; break; @@ -521,7 +521,7 @@ public void render(final GuiGraphics stack, int p_render_1_, int p_render_2_, fl } catch (final Exception ex) { - Log.getLogger().warn(pattern.get().getHashname()); + Log.getLogger().warn(pattern.value().getHashname()); Log.getLogger().error(ex); } } diff --git a/src/main/java/com/minecolonies/core/client/gui/townhall/WindowTownHallColonyManage.java b/src/main/java/com/minecolonies/core/client/gui/townhall/WindowTownHallColonyManage.java index d096ad067ed..8db4d1336ee 100644 --- a/src/main/java/com/minecolonies/core/client/gui/townhall/WindowTownHallColonyManage.java +++ b/src/main/java/com/minecolonies/core/client/gui/townhall/WindowTownHallColonyManage.java @@ -158,7 +158,7 @@ public void onCreate() final Player player = Minecraft.getInstance().player; final Component colonyName = Component.translatable(DEFAULT_COLONY_NAME, player.getName()); - new VanillaParticleMessage(pos.getX(), pos.getY(), pos.getZ(), ParticleTypes.DRAGON_BREATH).onExecute(null, false); + new VanillaParticleMessage(pos.getX(), pos.getY(), pos.getZ(), ParticleTypes.DRAGON_BREATH).onExecute(null, player); Minecraft.getInstance().level.playSound(Minecraft.getInstance().player, Minecraft.getInstance().player.blockPosition(), SoundEvents.CAMPFIRE_CRACKLE, SoundSource.AMBIENT, 2.5f, 0.8f); final boolean reactivate; diff --git a/src/main/java/com/minecolonies/core/client/render/worldevent/ColonyBlueprintRenderer.java b/src/main/java/com/minecolonies/core/client/render/worldevent/ColonyBlueprintRenderer.java index eeadbe66070..87c134b939b 100644 --- a/src/main/java/com/minecolonies/core/client/render/worldevent/ColonyBlueprintRenderer.java +++ b/src/main/java/com/minecolonies/core/client/render/worldevent/ColonyBlueprintRenderer.java @@ -123,7 +123,7 @@ static void renderBlueprints(final WorldEventContext ctx) { shouldRenderBlueprints = !shouldRenderBlueprints; - ctx.clientPlayer.playNotifySound(SoundEvents.NOTE_BLOCK_PLING.get(), SoundSource.NEUTRAL, 1.0F, shouldRenderBlueprints ? 0.75F : 0.25F); + ctx.clientPlayer.playNotifySound(SoundEvents.NOTE_BLOCK_PLING.value(), SoundSource.NEUTRAL, 1.0F, shouldRenderBlueprints ? 0.75F : 0.25F); } if (!ctx.hasNearestColony()) diff --git a/src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAISickTask.java b/src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAISickTask.java index 822d0c68fab..c5f8095b255 100755 --- a/src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAISickTask.java +++ b/src/main/java/com/minecolonies/core/entity/ai/minimal/EntityAISickTask.java @@ -249,7 +249,7 @@ private IState applyCure() citizen.swing(InteractionHand.MAIN_HAND); - citizen.playSound(SoundEvents.NOTE_BLOCK_HARP.get(), (float) BASIC_VOLUME, (float) SoundUtils.getRandomPentatonic(citizen.getRandom())); + citizen.playSound(SoundEvents.NOTE_BLOCK_HARP.value(), (float) BASIC_VOLUME, (float) SoundUtils.getRandomPentatonic(citizen.getRandom())); new CircleParticleEffectMessage(citizen.position().add(0, 2, 0), ParticleTypes.HAPPY_VILLAGER, waitingTicks) .sendToTrackingEntity(citizen); diff --git a/src/main/java/com/minecolonies/core/items/ItemScepterBeekeeper.java b/src/main/java/com/minecolonies/core/items/ItemScepterBeekeeper.java index efaf3c1cc04..1e4bfb9f6e7 100644 --- a/src/main/java/com/minecolonies/core/items/ItemScepterBeekeeper.java +++ b/src/main/java/com/minecolonies/core/items/ItemScepterBeekeeper.java @@ -79,7 +79,7 @@ public InteractionResult useOn(final UseOnContext useContext) { MessageUtils.format(TOOL_BEEHIVE_SCEPTER_REMOVE_HIVE).sendTo(useContext.getPlayer()); building.removeHive(pos); - SoundUtils.playSoundForPlayer((ServerPlayer) player, SoundEvents.NOTE_BLOCK_BELL.get(), (float) SoundUtils.VOLUME * 2, 0.5f); + SoundUtils.playSoundForPlayer((ServerPlayer) player, SoundEvents.NOTE_BLOCK_BELL.value(), (float) SoundUtils.VOLUME * 2, 0.5f); new ColonyViewBuildingViewMessage(building).sendToPlayer((ServerPlayer) player); } else diff --git a/src/main/java/com/minecolonies/core/network/messages/client/VanillaParticleMessage.java b/src/main/java/com/minecolonies/core/network/messages/client/VanillaParticleMessage.java index d280b857e9f..7e4236fa317 100755 --- a/src/main/java/com/minecolonies/core/network/messages/client/VanillaParticleMessage.java +++ b/src/main/java/com/minecolonies/core/network/messages/client/VanillaParticleMessage.java @@ -62,7 +62,7 @@ protected void toBytes(final FriendlyByteBuf byteBuf) } @Override - protected void onExecute(final PlayPayloadContext ctxIn, final Player player) + public void onExecute(final PlayPayloadContext ctxIn, final Player player) { spawnParticles(type, player.level(), x, y, z); } diff --git a/src/main/java/com/minecolonies/core/tileentities/TileEntityColonyFlag.java b/src/main/java/com/minecolonies/core/tileentities/TileEntityColonyFlag.java index 266e601ead4..7ef366a4776 100644 --- a/src/main/java/com/minecolonies/core/tileentities/TileEntityColonyFlag.java +++ b/src/main/java/com/minecolonies/core/tileentities/TileEntityColonyFlag.java @@ -123,7 +123,7 @@ public ItemStack getItemClient() for (Pair, DyeColor> pair : list) { CompoundTag pairNBT = new CompoundTag(); - pairNBT.putString(TAG_SINGLE_PATTERN, pair.getFirst().get().getHashname()); + pairNBT.putString(TAG_SINGLE_PATTERN, pair.getFirst().value().getHashname()); pairNBT.putInt(TAG_PATTERN_COLOR, pair.getSecond().getId()); nbt.add(pairNBT); }