Upstream/ViaFabric
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabric.git synced 2024-06-29 10:54:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update ViaVersion

Browse Source
This commit is contained in:
KennyTV 2021-06-04 13:27:02 +02:00
parent 1664ec58b0
commit c5ff2053fe
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
6 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -10,7 +10,7 @@ plugins {
}
def ENV = System.getenv()
def vvVer = "4.0.0-1.17-pre5-SNAPSHOT"
def vvVer = "4.0.0-1.17-pre5-20210604.101612-2"
description = "Client-side and server-side ViaVersion implementation for Fabric"
version = "0.4.1+" + ENV.GITHUB_RUN_NUMBER + "-" + getBranch()

11
viafabric-mc114/src/main/java/com/viaversion/fabric/mc114/providers/VRHandItemProvider.java
View File

@ -11,6 +11,7 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.util.Identifier;
import net.minecraft.world.World;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.item.DataItem;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
@ -28,16 +29,16 @@ public class VRHandItemProvider extends HandItemProvider {
if (info.isClientSide()) {
return getClientItem();
} else if ((serverItem = serverPlayers.get(info.getProtocolInfo().getUuid())) != null) {
return new Item(serverItem);
return new DataItem(serverItem);
}
return super.getHandItem(info);
}
private Item getClientItem() {
if (clientItem == null) {
return new Item(0, (byte) 0, (short) 0, null);
return new DataItem(0, (byte) 0, (short) 0, null);
}
return new Item(clientItem);
return new DataItem(clientItem);
}
@Environment(EnvType.CLIENT)
@ -76,9 +77,9 @@ public class VRHandItemProvider extends HandItemProvider {
private Item fromNative(ItemStack original) {
Identifier iid = Registry.ITEM.getId(original.getItem());
if (iid == null) return new Item(0, (byte) 0, (short) 0, null);
if (iid == null) return new DataItem(0, (byte) 0, (short) 0, null);
int id = swordId(iid.toString());
return new Item(id, (byte) original.getCount(), (short) original.getDamage(), null);
return new DataItem(id, (byte) original.getCount(), (short) original.getDamage(), null);
}
private int swordId(String id) {

11
viafabric-mc115/src/main/java/com/viaversion/fabric/mc115/providers/VRHandItemProvider.java
View File

@ -13,6 +13,7 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.util.Identifier;
import net.minecraft.world.World;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.item.DataItem;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
@ -30,16 +31,16 @@ public class VRHandItemProvider extends HandItemProvider {
if (info.isClientSide()) {
return getClientItem();
} else if ((serverItem = serverPlayers.get(info.getProtocolInfo().getUuid())) != null) {
return new Item(serverItem);
return new DataItem(serverItem);
}
return super.getHandItem(info);
}
private Item getClientItem() {
if (clientItem == null) {
return new Item(0, (byte) 0, (short) 0, null);
return new DataItem(0, (byte) 0, (short) 0, null);
}
return new Item(clientItem);
return new DataItem(clientItem);
}
@Environment(EnvType.CLIENT)
@ -86,9 +87,9 @@ public class VRHandItemProvider extends HandItemProvider {
private Item fromNative(ItemStack original) {
Identifier iid = Registry.ITEM.getId(original.getItem());
if (iid == null) return new Item(0, (byte) 0, (short) 0, null);
if (iid == null) return new DataItem(0, (byte) 0, (short) 0, null);
int id = swordId(iid.toString());
return new Item(id, (byte) original.getCount(), (short) original.getDamage(), null);
return new DataItem(id, (byte) original.getCount(), (short) original.getDamage(), null);
}
private int swordId(String id) {

11
viafabric-mc116/src/main/java/com/viaversion/fabric/mc116/providers/VRHandItemProvider.java
View File

@ -13,6 +13,7 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.util.Identifier;
import net.minecraft.world.World;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.item.DataItem;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
@ -30,16 +31,16 @@ public class VRHandItemProvider extends HandItemProvider {
if (info.isClientSide()) {
return getClientItem();
} else if ((serverItem = serverPlayers.get(info.getProtocolInfo().getUuid())) != null) {
return new Item(serverItem);
return new DataItem(serverItem);
}
return super.getHandItem(info);
}
private Item getClientItem() {
if (clientItem == null) {
return new Item(0, (byte) 0, (short) 0, null);
return new DataItem(0, (byte) 0, (short) 0, null);
}
return new Item(clientItem);
return new DataItem(clientItem);
}
@Environment(EnvType.CLIENT)
@ -86,9 +87,9 @@ public class VRHandItemProvider extends HandItemProvider {
private Item fromNative(ItemStack original) {
Identifier iid = Registry.ITEM.getId(original.getItem());
if (iid == null) return new Item(0, (byte) 0, (short) 0, null);
if (iid == null) return new DataItem(0, (byte) 0, (short) 0, null);
int id = swordId(iid.toString());
return new Item(id, (byte) original.getCount(), (short) original.getDamage(), null);
return new DataItem(id, (byte) original.getCount(), (short) original.getDamage(), null);
}
private int swordId(String id) {

11
viafabric-mc117/src/main/java/com/viaversion/fabric/mc117/providers/VRHandItemProvider.java
View File

@ -13,6 +13,7 @@ import net.minecraft.util.registry.Registry;
import net.minecraft.util.Identifier;
import net.minecraft.world.World;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.item.DataItem;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
@ -30,16 +31,16 @@ public class VRHandItemProvider extends HandItemProvider {
if (info.isClientSide()) {
return getClientItem();
} else if ((serverItem = serverPlayers.get(info.getProtocolInfo().getUuid())) != null) {
return new Item(serverItem);
return new DataItem(serverItem);
}
return super.getHandItem(info);
}
private Item getClientItem() {
if (clientItem == null) {
return new Item(0, (byte) 0, (short) 0, null);
return new DataItem(0, (byte) 0, (short) 0, null);
}
return new Item(clientItem);
return new DataItem(clientItem);
}
@Environment(EnvType.CLIENT)
@ -86,9 +87,9 @@ public class VRHandItemProvider extends HandItemProvider {
private Item fromNative(ItemStack original) {
Identifier iid = Registry.ITEM.getId(original.getItem());
if (iid == null) return new Item(0, (byte) 0, (short) 0, null);
if (iid == null) return new DataItem(0, (byte) 0, (short) 0, null);
int id = swordId(iid.toString());
return new Item(id, (byte) original.getCount(), (short) original.getDamage(), null);
return new DataItem(id, (byte) original.getCount(), (short) original.getDamage(), null);
}
private int swordId(String id) {

11
viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/providers/VRHandItemProvider.java
View File

@ -10,6 +10,7 @@ import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.minecraft.item.DataItem;
import com.viaversion.viaversion.api.minecraft.item.Item;
import com.viaversion.viaversion.protocols.protocol1_9to1_8.providers.HandItemProvider;
@ -27,16 +28,16 @@ public class VRHandItemProvider extends HandItemProvider {
if (info.isClientSide()) {
return getClientItem();
} else if ((serverItem = serverPlayers.get(info.getProtocolInfo().getUuid())) != null) {
return new Item(serverItem);
return new DataItem(serverItem);
}
return super.getHandItem(info);
}
private Item getClientItem() {
if (clientItem == null) {
return new Item(0, (byte) 0, (short) 0, null);
return new DataItem(0, (byte) 0, (short) 0, null);
}
return new Item(clientItem);
return new DataItem(clientItem);
}
@Environment(EnvType.CLIENT)
@ -70,9 +71,9 @@ public class VRHandItemProvider extends HandItemProvider {
}
private Item fromNative(ItemStack original) {
if (original == null) return new Item(0, (byte) 0, (short) 0, null);
if (original == null) return new DataItem(0, (byte) 0, (short) 0, null);
int id = net.minecraft.item.Item.getRawId(original.getItem());
return new Item(id, (byte) original.count, (short) original.getDamage(), null);
return new DataItem(id, (byte) original.count, (short) original.getDamage(), null);
}
private int swordId(String id) {