mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2025-01-30 12:51:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Fabric] Update Minecraft and Fabric API

Browse Source 
This also moves WorldEdit to use networking-v1 api
This commit is contained in:
i509VCB 2020-12-21 21:53:25 -06:00 committed by Octavia Togami
parent d0a52a9885
commit fce5ba2533
5 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-fabric/build.gradle.kts
View File

@ -25,9 +25,10 @@
accessWidener("src/main/resources/worldedit.accesswidener")
}
val minecraftVersion = "1.16.3"
val yarnMappings = "1.16.3+build.1:v2"
val loaderVersion = "0.9.3+build.207"
val minecraftVersion = "1.16.4"
val yarnMappings = "1.16.4+build.7:v2"
val loaderVersion = "0.10.8"
val fabricApiVersion = "0.28.3+1.16"
configurations.all {
resolutionStrategy {
@ -53,7 +54,7 @@
"modImplementation"("net.fabricmc:fabric-loader:$loaderVersion")
// [1] declare fabric-api dependency...
"fabricApi"("net.fabricmc.fabric-api:fabric-api:0.20.2+build.402-1.16")
"fabricApi"("net.fabricmc.fabric-api:fabric-api:$fabricApiVersion")
// [2] Load the API dependencies from the fabric mod json...
@Suppress("UNCHECKED_CAST")

4
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricEntityProperties.java
View File

@ -41,7 +41,7 @@
import net.minecraft.entity.vehicle.AbstractMinecartEntity;
import net.minecraft.entity.vehicle.BoatEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.village.Trader;
import net.minecraft.village.Merchant;
import static com.google.common.base.Preconditions.checkNotNull;
@ -121,7 +121,7 @@ public boolean isAmbient() {
@Override
public boolean isNPC() {
return entity instanceof Npc || entity instanceof Trader;
return entity instanceof Npc || entity instanceof Merchant;
}
@Override

6
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/FabricPlayer.java
View File

@ -43,12 +43,12 @@
import com.sk89q.worldedit.world.block.BlockStateHolder;
import com.sk89q.worldedit.world.block.BlockTypes;
import io.netty.buffer.Unpooled;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
import net.minecraft.network.packet.s2c.play.BlockUpdateS2CPacket;
import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.LiteralText;
import net.minecraft.text.MutableText;
@ -128,9 +128,9 @@ public void dispatchCUIEvent(CUIEvent event) {
if (params.length > 0) {
send = send + "|" + StringUtil.joinString(params, "|");
}
PacketByteBuf buffer = new PacketByteBuf(Unpooled.copiedBuffer(send.getBytes(WECUIPacketHandler.UTF_8_CHARSET)));
CustomPayloadS2CPacket packet = new CustomPayloadS2CPacket(new Identifier(FabricWorldEdit.MOD_ID, FabricWorldEdit.CUI_PLUGIN_CHANNEL), buffer);
this.player.networkHandler.sendPacket(packet);
ServerPlayNetworking.send(this.player, new Identifier(FabricWorldEdit.MOD_ID, FabricWorldEdit.CUI_PLUGIN_CHANNEL), buffer);
}
@Override

8
worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/net/handler/WECUIPacketHandler.java
View File

@ -23,8 +23,7 @@
import com.sk89q.worldedit.fabric.FabricAdapter;
import com.sk89q.worldedit.fabric.FabricPlayer;
import com.sk89q.worldedit.fabric.FabricWorldEdit;
import net.fabricmc.fabric.api.network.ServerSidePacketRegistry;
import net.minecraft.server.network.ServerPlayerEntity;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.util.Identifier;
import java.nio.charset.Charset;
@ -38,15 +37,14 @@ private WECUIPacketHandler() {
private static final Identifier CUI_IDENTIFIER = new Identifier(FabricWorldEdit.MOD_ID, FabricWorldEdit.CUI_PLUGIN_CHANNEL);
public static void init() {
ServerSidePacketRegistry.INSTANCE.register(CUI_IDENTIFIER, (packetContext, packetByteBuf) -> {
ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer();
ServerPlayNetworking.registerGlobalReceiver(CUI_IDENTIFIER, (server, player, handler, buf, responseSender) -> {
LocalSession session = FabricWorldEdit.inst.getSession(player);
if (session.hasCUISupport()) {
return;
}
String text = packetByteBuf.toString(UTF_8_CHARSET);
String text = buf.toString(UTF_8_CHARSET);
final FabricPlayer actor = FabricAdapter.adaptPlayer(player);
session.handleCUIInitializationMessage(text, actor);
session.describeCUI(actor);

2
worldedit-fabric/src/main/resources/fabric.mod.json
View File

@ -33,7 +33,7 @@
"fabric-command-api-v1": "*",
"fabric-lifecycle-events-v1": "*",
"fabric-events-interaction-v0": "*",
"fabric-networking-v0": "*"
"fabric-networking-api-v1": "*"
},
"mixins": [
"worldedit.mixins.json"