imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to 22w16b

Browse Source
This commit is contained in:
shedaniel
2022-04-21 13:55:59 +08:00
parent ce779d56b8
commit d6a12573ab
12 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
} }
plugins { 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 "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false
id "org.cadixdev.licenser" version "0.6.1" id "org.cadixdev.licenser" version "0.6.1"
id "com.matthewprenger.cursegradle" version "1.4.0" apply false id "com.matthewprenger.cursegradle" version "1.4.0" apply false

3
fabric/src/main/java/dev/architectury/hooks/fluid/fabric/FluidStackHooksImpl.java
View File

@@ -32,7 +32,6 @@ import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag; import net.minecraft.nbt.Tag;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluid;
@@ -48,7 +47,7 @@ public class FluidStackHooksImpl {
return getNameClient(stack); return getNameClient(stack);
} }
return new TranslatableComponent(getTranslationKey(stack)); return Component.translatable(getTranslationKey(stack));
} }
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)

4
fabric/src/main/java/dev/architectury/impl/fabric/ScreenInputDelegate.java
View File

@@ -22,7 +22,7 @@ package dev.architectury.impl.fabric;
import dev.architectury.event.events.client.ClientScreenInputEvent; import dev.architectury.event.events.client.ClientScreenInputEvent;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.Component;
public interface ScreenInputDelegate { public interface ScreenInputDelegate {
Screen architectury_delegateInputs(); Screen architectury_delegateInputs();
@@ -31,7 +31,7 @@ public interface ScreenInputDelegate {
private Screen parent; private Screen parent;
public DelegateScreen(Screen parent) { public DelegateScreen(Screen parent) {
super(TextComponent.EMPTY); super(Component.empty());
this.parent = parent; this.parent = parent;
} }

3
fabric/src/main/java/dev/architectury/mixin/fabric/MixinServerGamePacketListenerImpl.java
View File

@@ -23,7 +23,6 @@ import dev.architectury.event.events.common.ChatEvent;
import dev.architectury.impl.fabric.ChatComponentImpl; import dev.architectury.impl.fabric.ChatComponentImpl;
import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.ChatType;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.network.ServerGamePacketListenerImpl;
@@ -70,7 +69,7 @@ public abstract class MixinServerGamePacketListenerImpl {
this.chatSpamTickCount += 20; this.chatSpamTickCount += 20;
if (this.chatSpamTickCount > 200 && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { 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(); ci.cancel();
} }

6
fabric/src/main/java/dev/architectury/networking/fabric/SpawnEntityPacket.java
View File

@@ -100,8 +100,10 @@ public class SpawnEntityPacket {
} }
entity.setUUID(uuid); entity.setUUID(uuid);
entity.setId(id); entity.setId(id);
entity.setPacketCoordinates(x, y, z); entity.syncPacketPositionCodec(x, y, z);
entity.absMoveTo(x, y, z, xRot, yRot); entity.moveTo(x, y, z);
entity.setXRot(xRot);
entity.setYRot(yRot);
entity.setYHeadRot(yHeadRot); entity.setYHeadRot(yHeadRot);
entity.setYBodyRot(yHeadRot); entity.setYBodyRot(yHeadRot);
if (entity instanceof EntitySpawnExtension ext) { if (entity instanceof EntitySpawnExtension ext) {

8
gradle.properties
View File

@@ -3,8 +3,8 @@ org.gradle.daemon=false
forgeEnabled=false forgeEnabled=false
minecraft_version=22w15a minecraft_version=22w16b
supported_version=22w15a supported_version=22w16b
cf_type=beta cf_type=beta
@@ -13,8 +13,8 @@ archives_base_name_snapshot=architectury-snapshot
base_version=5.2 base_version=5.2
maven_group=dev.architectury maven_group=dev.architectury
fabric_loader_version=0.13.3 fabric_loader_version=0.14.0
fabric_api_version=0.50.1+1.19 fabric_api_version=0.51.2+1.19
mod_menu_version=3.1.0 mod_menu_version=3.1.0
forge_version=40.0.1 forge_version=40.0.1

4
testmod-common/src/main/java/dev/architectury/test/debug/client/ClientOverlayMessageSink.java
View File

@@ -30,11 +30,9 @@ import net.minecraft.Util;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.GuiComponent;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator;
import java.util.List; import java.util.List;
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
@@ -53,7 +51,7 @@ public class ClientOverlayMessageSink extends ConsoleMessageSink {
@Override @Override
public void accept(String message) { public void accept(String message) {
super.accept(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) { public void render(PoseStack matrices, float delta) {

13
testmod-common/src/main/java/dev/architectury/test/events/DebugEvents.java
View File

@@ -33,8 +33,7 @@ import net.fabricmc.api.Environment;
import net.minecraft.client.gui.screens.inventory.AnvilScreen; import net.minecraft.client.gui.screens.inventory.AnvilScreen;
import net.minecraft.core.Position; import net.minecraft.core.Position;
import net.minecraft.core.Vec3i; import net.minecraft.core.Vec3i;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
@@ -93,7 +92,7 @@ public class DebugEvents {
EntityEvent.ENTER_SECTION.register(((entity, nx, ny, nz, ox, oy, oz) -> { EntityEvent.ENTER_SECTION.register(((entity, nx, ny, nz, ox, oy, oz) -> {
if (entity instanceof Player player) { if (entity instanceof Player player) {
TestMod.SINK.accept("%s switched section: %s => %s", entity.getScoreboardName(), sectionPos(ox, oy, oz), sectionPos(nx, oy, nz)); 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) -> { 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()); TestMod.SINK.accept(player.getScoreboardName() + " was awarded with %s" + logSide(player.level), advancement.getChatComponent().getString());
}); });
PlayerEvent.CRAFT_ITEM.register((player, constructed, inventory) -> { 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) -> { 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) -> { 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) -> { 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(); return EventResult.pass();
}); });
PlayerEvent.OPEN_MENU.register((player, menu) -> { PlayerEvent.OPEN_MENU.register((player, menu) -> {

6
testmod-common/src/main/java/dev/architectury/test/item/TestBlockInteractions.java
View File

@@ -24,7 +24,7 @@ import dev.architectury.hooks.item.tool.HoeItemHooks;
import dev.architectury.hooks.item.tool.ShovelItemHooks; import dev.architectury.hooks.item.tool.ShovelItemHooks;
import net.minecraft.Util; import net.minecraft.Util;
import net.minecraft.core.BlockPos; 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.entity.player.Player;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
@@ -40,7 +40,7 @@ public final class TestBlockInteractions {
if (!ctx.getLevel().isClientSide) { if (!ctx.getLevel().isClientSide) {
Player player = ctx.getPlayer(); Player player = ctx.getPlayer();
if (player != null) 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; return false;
} }
@@ -51,7 +51,7 @@ public final class TestBlockInteractions {
if (!ctx.getLevel().isClientSide) { if (!ctx.getLevel().isClientSide) {
Player player = ctx.getPlayer(); Player player = ctx.getPlayer();
if (player != null) 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);
} }
}); });
} }

4
testmod-common/src/main/java/dev/architectury/test/networking/ButtonClickedMessage.java
View File

@@ -24,7 +24,7 @@ import dev.architectury.networking.simple.BaseC2SMessage;
import dev.architectury.networking.simple.MessageType; import dev.architectury.networking.simple.MessageType;
import net.minecraft.Util; import net.minecraft.Util;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.Component;
public class ButtonClickedMessage extends BaseC2SMessage { public class ButtonClickedMessage extends BaseC2SMessage {
private final int buttonId; private final int buttonId;
@@ -52,6 +52,6 @@ public class ButtonClickedMessage extends BaseC2SMessage {
@Override @Override
public void handle(NetworkManager.PacketContext context) { 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);
} }
} }

4
testmod-common/src/main/java/dev/architectury/test/networking/SyncDataMessage.java
View File

@@ -25,7 +25,7 @@ import dev.architectury.networking.simple.MessageType;
import net.minecraft.Util; import net.minecraft.Util;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.Component;
public class SyncDataMessage extends BaseS2CMessage { public class SyncDataMessage extends BaseS2CMessage {
private final CompoundTag serverData; private final CompoundTag serverData;
@@ -55,6 +55,6 @@ public class SyncDataMessage extends BaseS2CMessage {
@Override @Override
public void handle(NetworkManager.PacketContext context) { 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);
} }
} }

4
testmod-common/src/main/java/dev/architectury/test/registry/objects/EquippableTickingItem.java
View File

@@ -21,7 +21,7 @@ package dev.architectury.test.registry.objects;
import dev.architectury.extensions.ItemExtension; import dev.architectury.extensions.ItemExtension;
import dev.architectury.test.TestMod; 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.EquipmentSlot;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
@@ -35,7 +35,7 @@ public class EquippableTickingItem extends Item implements ItemExtension {
@Override @Override
public void tickArmor(ItemStack stack, Player player) { 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 @Nullable