From d6a12573abd1b9d2ea2586c0b4fbca69bcb367ce Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 21 Apr 2022 13:55:59 +0800 Subject: [PATCH] Update to 22w16b --- build.gradle | 2 +- .../hooks/fluid/fabric/FluidStackHooksImpl.java | 3 +-- .../impl/fabric/ScreenInputDelegate.java | 4 ++-- .../fabric/MixinServerGamePacketListenerImpl.java | 3 +-- .../networking/fabric/SpawnEntityPacket.java | 6 ++++-- gradle.properties | 8 ++++---- .../test/debug/client/ClientOverlayMessageSink.java | 4 +--- .../dev/architectury/test/events/DebugEvents.java | 13 ++++++------- .../test/item/TestBlockInteractions.java | 6 +++--- .../test/networking/ButtonClickedMessage.java | 4 ++-- .../test/networking/SyncDataMessage.java | 4 ++-- .../registry/objects/EquippableTickingItem.java | 4 ++-- 12 files changed, 29 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index 0d53b23b..3e8abac5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { - id "architectury-plugin" version "3.4.130" + id "architectury-plugin" version "3.4-SNAPSHOT" id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false id "org.cadixdev.licenser" version "0.6.1" id "com.matthewprenger.cursegradle" version "1.4.0" apply false diff --git a/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java b/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java index 2d4d598f..33cda64c 100644 --- a/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java +++ b/fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java @@ -32,7 +32,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.material.Fluid; @@ -48,7 +47,7 @@ public class FluidStackHooksImpl { return getNameClient(stack); } - return new TranslatableComponent(getTranslationKey(stack)); + return Component.translatable(getTranslationKey(stack)); } @Environment(EnvType.CLIENT) diff --git a/fabric/src/main/java/dev/architectury/impl/fabric/ScreenInputDelegate.java b/fabric/src/main/java/dev/architectury/impl/fabric/ScreenInputDelegate.java index 623d5d29..8c152db2 100644 --- a/fabric/src/main/java/dev/architectury/impl/fabric/ScreenInputDelegate.java +++ b/fabric/src/main/java/dev/architectury/impl/fabric/ScreenInputDelegate.java @@ -22,7 +22,7 @@ package dev.architectury.impl.fabric; import dev.architectury.event.events.client.ClientScreenInputEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; public interface ScreenInputDelegate { Screen architectury_delegateInputs(); @@ -31,7 +31,7 @@ public interface ScreenInputDelegate { private Screen parent; public DelegateScreen(Screen parent) { - super(TextComponent.EMPTY); + super(Component.empty()); this.parent = parent; } diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java index a635021d..d831121c 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java @@ -23,7 +23,6 @@ import dev.architectury.event.events.common.ChatEvent; import dev.architectury.impl.fabric.ChatComponentImpl; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerGamePacketListenerImpl; @@ -70,7 +69,7 @@ public abstract class MixinServerGamePacketListenerImpl { this.chatSpamTickCount += 20; if (this.chatSpamTickCount > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { - this.disconnect(new TranslatableComponent("disconnect.spam")); + this.disconnect(Component.translatable("disconnect.spam")); } ci.cancel(); } diff --git a/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java b/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java index 1183314a..c6068c83 100644 --- a/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java +++ b/fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java @@ -100,8 +100,10 @@ public class SpawnEntityPacket { } entity.setUUID(uuid); entity.setId(id); - entity.setPacketCoordinates(x, y, z); - entity.absMoveTo(x, y, z, xRot, yRot); + entity.syncPacketPositionCodec(x, y, z); + entity.moveTo(x, y, z); + entity.setXRot(xRot); + entity.setYRot(yRot); entity.setYHeadRot(yHeadRot); entity.setYBodyRot(yHeadRot); if (entity instanceof EntitySpawnExtension ext) { diff --git a/gradle.properties b/gradle.properties index 8b55f931..997b6c0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false forgeEnabled=false -minecraft_version=22w15a -supported_version=22w15a +minecraft_version=22w16b +supported_version=22w16b cf_type=beta @@ -13,8 +13,8 @@ archives_base_name_snapshot=architectury-snapshot base_version=5.2 maven_group=dev.architectury -fabric_loader_version=0.13.3 -fabric_api_version=0.50.1+1.19 +fabric_loader_version=0.14.0 +fabric_api_version=0.51.2+1.19 mod_menu_version=3.1.0 forge_version=40.0.1 diff --git a/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java b/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java index 8806e345..f726c129 100644 --- a/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java +++ b/testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java @@ -30,11 +30,9 @@ import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiComponent; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.util.Mth; import java.util.Collections; -import java.util.Iterator; import java.util.List; @Environment(EnvType.CLIENT) @@ -53,7 +51,7 @@ public class ClientOverlayMessageSink extends ConsoleMessageSink { @Override public void accept(String message) { super.accept(message); - messages.add(0, new Message(new TextComponent(message), Util.getMillis())); + messages.add(0, new Message(Component.literal(message), Util.getMillis())); } public void render(PoseStack matrices, float delta) { diff --git a/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java b/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java index c4429b52..ce43c54a 100644 --- a/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java +++ b/testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java @@ -33,8 +33,7 @@ import net.fabricmc.api.Environment; import net.minecraft.client.gui.screens.inventory.AnvilScreen; import net.minecraft.core.Position; import net.minecraft.core.Vec3i; -import net.minecraft.network.chat.TextComponent; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; @@ -93,7 +92,7 @@ public class DebugEvents { EntityEvent.ENTER_SECTION.register(((entity, nx, ny, nz, ox, oy, oz) -> { if (entity instanceof Player player) { TestMod.SINK.accept("%s switched section: %s => %s", entity.getScoreboardName(), sectionPos(ox, oy, oz), sectionPos(nx, oy, nz)); - player.displayClientMessage(new TextComponent("Entering chunk: " + sectionPos(nx, ny, nz)), true); + player.displayClientMessage(Component.literal("Entering chunk: " + sectionPos(nx, ny, nz)), true); } })); EntityEvent.LIVING_CHECK_SPAWN.register(((entity, level, x, y, z, type, spawner) -> { @@ -189,16 +188,16 @@ public class DebugEvents { TestMod.SINK.accept(player.getScoreboardName() + " was awarded with %s" + logSide(player.level), advancement.getChatComponent().getString()); }); PlayerEvent.CRAFT_ITEM.register((player, constructed, inventory) -> { - TestMod.SINK.accept(player.getScoreboardName() + " crafts " + new TranslatableComponent(constructed.getDescriptionId()).getString() + logSide(player.level)); + TestMod.SINK.accept(player.getScoreboardName() + " crafts " + Component.translatable(constructed.getDescriptionId()).getString() + logSide(player.level)); }); PlayerEvent.SMELT_ITEM.register((player, smelted) -> { - TestMod.SINK.accept(player.getScoreboardName() + " smelts " + new TranslatableComponent(smelted.getDescriptionId()).getString() + logSide(player.level)); + TestMod.SINK.accept(player.getScoreboardName() + " smelts " + Component.translatable(smelted.getDescriptionId()).getString() + logSide(player.level)); }); PlayerEvent.PICKUP_ITEM_POST.register((player, entity, stack) -> { - TestMod.SINK.accept(player.getScoreboardName() + " picks up " + new TranslatableComponent(stack.getDescriptionId()).getString() + logSide(player.level)); + TestMod.SINK.accept(player.getScoreboardName() + " picks up " + Component.translatable(stack.getDescriptionId()).getString() + logSide(player.level)); }); PlayerEvent.DROP_ITEM.register((player, entity) -> { - TestMod.SINK.accept(player.getScoreboardName() + " drops " + new TranslatableComponent(entity.getItem().getDescriptionId()).getString() + logSide(player.level)); + TestMod.SINK.accept(player.getScoreboardName() + " drops " + Component.translatable(entity.getItem().getDescriptionId()).getString() + logSide(player.level)); return EventResult.pass(); }); PlayerEvent.OPEN_MENU.register((player, menu) -> { diff --git a/testmod-common/src/main/java/dev/architectury/test/item/TestBlockInteractions.java b/testmod-common/src/main/java/dev/architectury/test/item/TestBlockInteractions.java index 09862ccd..83ba323b 100644 --- a/testmod-common/src/main/java/dev/architectury/test/item/TestBlockInteractions.java +++ b/testmod-common/src/main/java/dev/architectury/test/item/TestBlockInteractions.java @@ -24,7 +24,7 @@ import dev.architectury.hooks.item.tool.HoeItemHooks; import dev.architectury.hooks.item.tool.ShovelItemHooks; import net.minecraft.Util; import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Blocks; @@ -40,7 +40,7 @@ public final class TestBlockInteractions { if (!ctx.getLevel().isClientSide) { Player player = ctx.getPlayer(); if (player != null) - player.sendMessage(new TextComponent("These dark arts can only be done at night!"), Util.NIL_UUID); + player.sendMessage(Component.literal("These dark arts can only be done at night!"), Util.NIL_UUID); } return false; } @@ -51,7 +51,7 @@ public final class TestBlockInteractions { if (!ctx.getLevel().isClientSide) { Player player = ctx.getPlayer(); if (player != null) - player.sendMessage(new TextComponent("Thou has successfully committed the dark arts of alchemy!!"), Util.NIL_UUID); + player.sendMessage(Component.literal("Thou has successfully committed the dark arts of alchemy!!"), Util.NIL_UUID); } }); } diff --git a/testmod-common/src/main/java/dev/architectury/test/networking/ButtonClickedMessage.java b/testmod-common/src/main/java/dev/architectury/test/networking/ButtonClickedMessage.java index d63f337a..77c73755 100644 --- a/testmod-common/src/main/java/dev/architectury/test/networking/ButtonClickedMessage.java +++ b/testmod-common/src/main/java/dev/architectury/test/networking/ButtonClickedMessage.java @@ -24,7 +24,7 @@ import dev.architectury.networking.simple.BaseC2SMessage; import dev.architectury.networking.simple.MessageType; import net.minecraft.Util; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; public class ButtonClickedMessage extends BaseC2SMessage { private final int buttonId; @@ -52,6 +52,6 @@ public class ButtonClickedMessage extends BaseC2SMessage { @Override public void handle(NetworkManager.PacketContext context) { - context.getPlayer().sendMessage(new TextComponent("You clicked button #" + buttonId), Util.NIL_UUID); + context.getPlayer().sendMessage(Component.literal("You clicked button #" + buttonId), Util.NIL_UUID); } } \ No newline at end of file diff --git a/testmod-common/src/main/java/dev/architectury/test/networking/SyncDataMessage.java b/testmod-common/src/main/java/dev/architectury/test/networking/SyncDataMessage.java index 5bf9a84e..89b29107 100644 --- a/testmod-common/src/main/java/dev/architectury/test/networking/SyncDataMessage.java +++ b/testmod-common/src/main/java/dev/architectury/test/networking/SyncDataMessage.java @@ -25,7 +25,7 @@ import dev.architectury.networking.simple.MessageType; import net.minecraft.Util; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; public class SyncDataMessage extends BaseS2CMessage { private final CompoundTag serverData; @@ -55,6 +55,6 @@ public class SyncDataMessage extends BaseS2CMessage { @Override public void handle(NetworkManager.PacketContext context) { - context.getPlayer().sendMessage(new TextComponent("Received data from server: " + serverData), Util.NIL_UUID); + context.getPlayer().sendMessage(Component.literal("Received data from server: " + serverData), Util.NIL_UUID); } } \ No newline at end of file diff --git a/testmod-common/src/main/java/dev/architectury/test/registry/objects/EquippableTickingItem.java b/testmod-common/src/main/java/dev/architectury/test/registry/objects/EquippableTickingItem.java index 9a031ad0..69a7092e 100644 --- a/testmod-common/src/main/java/dev/architectury/test/registry/objects/EquippableTickingItem.java +++ b/testmod-common/src/main/java/dev/architectury/test/registry/objects/EquippableTickingItem.java @@ -21,7 +21,7 @@ package dev.architectury.test.registry.objects; import dev.architectury.extensions.ItemExtension; import dev.architectury.test.TestMod; -import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -35,7 +35,7 @@ public class EquippableTickingItem extends Item implements ItemExtension { @Override public void tickArmor(ItemStack stack, Player player) { - TestMod.SINK.accept("Ticking " + new TranslatableComponent(stack.getDescriptionId()).getString()); + TestMod.SINK.accept("Ticking " + Component.translatable(stack.getDescriptionId()).getString()); } @Nullable