mirror of
https://github.com/ViaVersion/ViaFabricPlus.git
synced 2024-09-30 04:47:28 +02:00
Update Via* libraries
This commit is contained in:
parent
5fcf377366
commit
36362bd1bc
@ -14,16 +14,16 @@ maven_group=de.florianmichael
|
|||||||
archives_base_name=ViaFabricPlus
|
archives_base_name=ViaFabricPlus
|
||||||
|
|
||||||
# ViaVersion Libraries
|
# ViaVersion Libraries
|
||||||
viaversion_version=5.0.0-SNAPSHOT
|
viaversion_version=5.0.0
|
||||||
viabackwards_version=5.0.0-SNAPSHOT
|
viabackwards_version=5.0.0
|
||||||
vialegacy_version=3.0.0-SNAPSHOT
|
vialegacy_version=3.0.0
|
||||||
viaaprilfools_version=3.0.0-SNAPSHOT
|
viaaprilfools_version=3.0.0
|
||||||
vialoader_version=3.0.0-SNAPSHOT
|
vialoader_version=3.0.0
|
||||||
|
|
||||||
# RaphiMC Libraries
|
# RaphiMC Libraries
|
||||||
minecraftauth_version=4.0.0
|
minecraftauth_version=4.0.0
|
||||||
|
|
||||||
viabedrock_version=0.0.8-SNAPSHOT
|
viabedrock_version=0.0.9-SNAPSHOT
|
||||||
raknet_transport_version=1.0.0.CR3-SNAPSHOT
|
raknet_transport_version=1.0.0.CR3-SNAPSHOT
|
||||||
|
|
||||||
# Lenni0451 Libraries
|
# Lenni0451 Libraries
|
||||||
|
@ -39,6 +39,7 @@ public class ResourcePackHeaderDiff {
|
|||||||
private final static Map<ProtocolVersion, GameVersion> GAME_VERSION_DIFF = new HashMap<>();
|
private final static Map<ProtocolVersion, GameVersion> GAME_VERSION_DIFF = new HashMap<>();
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
registerVersion(ProtocolVersion.v1_21, 34, "1.21");
|
||||||
registerVersion(ProtocolVersion.v1_20_5, 32, "1.20.6");
|
registerVersion(ProtocolVersion.v1_20_5, 32, "1.20.6");
|
||||||
registerVersion(ProtocolVersion.v1_20_3, 22, "1.20.4");
|
registerVersion(ProtocolVersion.v1_20_3, 22, "1.20.4");
|
||||||
registerVersion(ProtocolVersion.v1_20_2, 18, "1.20.2");
|
registerVersion(ProtocolVersion.v1_20_2, 18, "1.20.2");
|
||||||
|
@ -148,7 +148,7 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
|
|||||||
// Add item blocking by make the sword eatable, counterpart in MixinSwordItem
|
// Add item blocking by make the sword eatable, counterpart in MixinSwordItem
|
||||||
if (user.getProtocolInfo().serverProtocolVersion().betweenInclusive(LegacyProtocolVersion.b1_8tob1_8_1, ProtocolVersion.v1_8)) {
|
if (user.getProtocolInfo().serverProtocolVersion().betweenInclusive(LegacyProtocolVersion.b1_8tob1_8_1, ProtocolVersion.v1_8)) {
|
||||||
if (this.viaFabricPlus$swordItems1_8.contains(identifier)) {
|
if (this.viaFabricPlus$swordItems1_8.contains(identifier)) {
|
||||||
data.set(StructuredDataKey.FOOD, new FoodProperties(0, 0F, true, 3600, new FoodEffect[0]));
|
data.set(StructuredDataKey.FOOD1_20_5, new FoodProperties(0, 0F, true, 3600, null, new FoodEffect[0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -163,7 +163,7 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
|
|||||||
if (user.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3)) {
|
if (user.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.b1_7tob1_7_3)) {
|
||||||
if (this.viaFabricPlus$foodItems_b1_7_3.contains(identifier)) {
|
if (this.viaFabricPlus$foodItems_b1_7_3.contains(identifier)) {
|
||||||
data.set(StructuredDataKey.MAX_STACK_SIZE, 1);
|
data.set(StructuredDataKey.MAX_STACK_SIZE, 1);
|
||||||
data.addEmpty(StructuredDataKey.FOOD);
|
data.addEmpty(StructuredDataKey.FOOD1_20_5);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -19,15 +19,15 @@
|
|||||||
|
|
||||||
package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
|
package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion;
|
||||||
|
|
||||||
|
import com.viaversion.nbt.tag.CompoundTag;
|
||||||
|
import com.viaversion.nbt.tag.ListTag;
|
||||||
import com.viaversion.viaversion.api.minecraft.item.Item;
|
import com.viaversion.viaversion.api.minecraft.item.Item;
|
||||||
import com.viaversion.viaversion.api.minecraft.item.data.ModifierData;
|
import com.viaversion.viaversion.api.minecraft.item.data.AttributeModifiers1_20_5;
|
||||||
import com.viaversion.viaversion.api.type.Type;
|
import com.viaversion.viaversion.api.type.Type;
|
||||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
|
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap;
|
||||||
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
|
import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap;
|
||||||
import com.viaversion.viaversion.libs.gson.JsonElement;
|
import com.viaversion.viaversion.libs.gson.JsonElement;
|
||||||
import com.viaversion.viaversion.libs.gson.JsonObject;
|
import com.viaversion.viaversion.libs.gson.JsonObject;
|
||||||
import com.viaversion.nbt.tag.CompoundTag;
|
|
||||||
import com.viaversion.nbt.tag.ListTag;
|
|
||||||
import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9;
|
import com.viaversion.viaversion.protocols.v1_8to1_9.Protocol1_8To1_9;
|
||||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ClientboundPackets1_8;
|
||||||
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9;
|
import com.viaversion.viaversion.protocols.v1_8to1_9.packet.ServerboundPackets1_9;
|
||||||
@ -53,7 +53,7 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
|
|||||||
private final Int2ObjectMap<String> viaFabricPlus$itemIdentifiers = new Int2ObjectOpenHashMap<>();
|
private final Int2ObjectMap<String> viaFabricPlus$itemIdentifiers = new Int2ObjectOpenHashMap<>();
|
||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private final Map<String, Map<String, Pair<String, ModifierData>>> viaFabricPlus$itemAttributes = new HashMap<>();
|
private final Map<String, Map<String, Pair<String, AttributeModifiers1_20_5.ModifierData>>> viaFabricPlus$itemAttributes = new HashMap<>();
|
||||||
|
|
||||||
public MixinItemPacketRewriter1_9(Protocol1_8To1_9 protocol, Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType) {
|
public MixinItemPacketRewriter1_9(Protocol1_8To1_9 protocol, Type<Item> itemType, Type<Item[]> itemArrayType, Type<Item> mappedItemType, Type<Item[]> mappedItemArrayType) {
|
||||||
super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType);
|
super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType);
|
||||||
@ -69,11 +69,11 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
|
|||||||
final JsonObject itemAttributes = ViaFabricPlusMappingDataLoader.INSTANCE.loadData("item-attributes-1.8.json");
|
final JsonObject itemAttributes = ViaFabricPlusMappingDataLoader.INSTANCE.loadData("item-attributes-1.8.json");
|
||||||
for (Map.Entry<String, JsonElement> itemEntry : itemAttributes.entrySet()) {
|
for (Map.Entry<String, JsonElement> itemEntry : itemAttributes.entrySet()) {
|
||||||
final String itemIdentifier = itemEntry.getKey();
|
final String itemIdentifier = itemEntry.getKey();
|
||||||
final Map<String, Pair<String, ModifierData>> attributes = new HashMap<>();
|
final Map<String, Pair<String, AttributeModifiers1_20_5.ModifierData>> attributes = new HashMap<>();
|
||||||
for (Map.Entry<String, JsonElement> attributeEntry : itemEntry.getValue().getAsJsonObject().entrySet()) {
|
for (Map.Entry<String, JsonElement> attributeEntry : itemEntry.getValue().getAsJsonObject().entrySet()) {
|
||||||
final String attribute = attributeEntry.getKey();
|
final String attribute = attributeEntry.getKey();
|
||||||
final JsonObject attributeData = attributeEntry.getValue().getAsJsonObject();
|
final JsonObject attributeData = attributeEntry.getValue().getAsJsonObject();
|
||||||
final ModifierData modifierData = new ModifierData(UUID.fromString(attributeData.get("id").getAsString()), attributeData.get("name").getAsString(), attributeData.get("amount").getAsDouble(), attributeData.get("operation").getAsInt());
|
final AttributeModifiers1_20_5.ModifierData modifierData = new AttributeModifiers1_20_5.ModifierData(UUID.fromString(attributeData.get("id").getAsString()), attributeData.get("name").getAsString(), attributeData.get("amount").getAsDouble(), attributeData.get("operation").getAsInt());
|
||||||
final String slot = attributeData.get("slot").getAsString();
|
final String slot = attributeData.get("slot").getAsString();
|
||||||
attributes.put(attribute, new Pair<>(slot, modifierData));
|
attributes.put(attribute, new Pair<>(slot, modifierData));
|
||||||
}
|
}
|
||||||
@ -88,7 +88,7 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
|
|||||||
|
|
||||||
final String identifier = viaFabricPlus$itemIdentifiers.get(item.identifier());
|
final String identifier = viaFabricPlus$itemIdentifiers.get(item.identifier());
|
||||||
if (identifier != null && viaFabricPlus$itemAttributes.containsKey(identifier)) {
|
if (identifier != null && viaFabricPlus$itemAttributes.containsKey(identifier)) {
|
||||||
final Map<String, Pair<String, ModifierData>> attributes = viaFabricPlus$itemAttributes.get(identifier);
|
final Map<String, Pair<String, AttributeModifiers1_20_5.ModifierData>> attributes = viaFabricPlus$itemAttributes.get(identifier);
|
||||||
final CompoundTag attributeFixTag = new CompoundTag();
|
final CompoundTag attributeFixTag = new CompoundTag();
|
||||||
CompoundTag tag = item.tag();
|
CompoundTag tag = item.tag();
|
||||||
if (tag == null) {
|
if (tag == null) {
|
||||||
@ -101,7 +101,7 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter<Clientboun
|
|||||||
ListTag<CompoundTag> attributeModifiers = tag.getListTag("AttributeModifiers", CompoundTag.class);
|
ListTag<CompoundTag> attributeModifiers = tag.getListTag("AttributeModifiers", CompoundTag.class);
|
||||||
if (attributeModifiers == null) {
|
if (attributeModifiers == null) {
|
||||||
attributeModifiers = new ListTag<>(CompoundTag.class);
|
attributeModifiers = new ListTag<>(CompoundTag.class);
|
||||||
for (Map.Entry<String, Pair<String, ModifierData>> entry : attributes.entrySet()) {
|
for (Map.Entry<String, Pair<String, AttributeModifiers1_20_5.ModifierData>> entry : attributes.entrySet()) {
|
||||||
final CompoundTag attributeModifier = new CompoundTag();
|
final CompoundTag attributeModifier = new CompoundTag();
|
||||||
attributeModifier.putString("AttributeName", entry.getKey());
|
attributeModifier.putString("AttributeName", entry.getKey());
|
||||||
attributeModifier.putString("Name", entry.getValue().value().name());
|
attributeModifier.putString("Name", entry.getValue().value().name());
|
||||||
|
Loading…
Reference in New Issue
Block a user