Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-12-27 16:40:10 +01:00
Fix handling of sweeping
Dieser Commit ist enthalten in:
Ursprung
bc0b4470f6
Commit
f525ad98e7
@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
|
||||||
|
* Copyright (C) 2016-2024 ViaVersion and contributors
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data;
|
||||||
|
|
||||||
|
import com.viaversion.viaversion.util.KeyMappings;
|
||||||
|
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||||
|
|
||||||
|
public final class Enchantments1_20_5 {
|
||||||
|
|
||||||
|
public static final KeyMappings ENCHANTMENTS = new KeyMappings(
|
||||||
|
"protection",
|
||||||
|
"fire_protection",
|
||||||
|
"feather_falling",
|
||||||
|
"blast_protection",
|
||||||
|
"projectile_protection",
|
||||||
|
"respiration",
|
||||||
|
"aqua_affinity",
|
||||||
|
"thorns",
|
||||||
|
"depth_strider",
|
||||||
|
"frost_walker",
|
||||||
|
"binding_curse",
|
||||||
|
"soul_speed",
|
||||||
|
"swift_sneak",
|
||||||
|
"sharpness",
|
||||||
|
"smite",
|
||||||
|
"bane_of_arthropods",
|
||||||
|
"knockback",
|
||||||
|
"fire_aspect",
|
||||||
|
"looting",
|
||||||
|
"sweeping_edge",
|
||||||
|
"efficiency",
|
||||||
|
"silk_touch",
|
||||||
|
"unbreaking",
|
||||||
|
"fortune",
|
||||||
|
"power",
|
||||||
|
"punch",
|
||||||
|
"flame",
|
||||||
|
"infinity",
|
||||||
|
"luck_of_the_sea",
|
||||||
|
"lure",
|
||||||
|
"loyalty",
|
||||||
|
"impaling",
|
||||||
|
"riptide",
|
||||||
|
"channeling",
|
||||||
|
"multishot",
|
||||||
|
"quick_charge",
|
||||||
|
"piercing",
|
||||||
|
"density",
|
||||||
|
"breach",
|
||||||
|
"wind_burst",
|
||||||
|
"mending",
|
||||||
|
"vanishing_curse"
|
||||||
|
);
|
||||||
|
|
||||||
|
public static @Nullable String idToKey(final int id) {
|
||||||
|
return ENCHANTMENTS.idToKey(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int keyToId(final String enchantment) {
|
||||||
|
return ENCHANTMENTS.keyToId(enchantment);
|
||||||
|
}
|
||||||
|
}
|
@ -75,7 +75,7 @@ import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.packet.Clientb
|
|||||||
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3;
|
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.Protocol1_20_5To1_20_3;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5;
|
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Attributes1_20_5;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DyeColors;
|
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.DyeColors;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_3;
|
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Enchantments1_20_5;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5;
|
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.PotionEffects1_20_5;
|
||||||
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Potions1_20_5;
|
import com.viaversion.viaversion.protocols.protocol1_20_5to1_20_3.data.Potions1_20_5;
|
||||||
import com.viaversion.viaversion.rewriter.ComponentRewriter;
|
import com.viaversion.viaversion.rewriter.ComponentRewriter;
|
||||||
@ -338,7 +338,7 @@ public class ComponentRewriter1_20_5 extends ComponentRewriter<ClientboundPacket
|
|||||||
final CompoundTag levels = new CompoundTag();
|
final CompoundTag levels = new CompoundTag();
|
||||||
for (final Int2IntMap.Entry entry : value.enchantments().int2IntEntrySet()) {
|
for (final Int2IntMap.Entry entry : value.enchantments().int2IntEntrySet()) {
|
||||||
final int level = checkIntRange(0, 255, entry.getIntValue());
|
final int level = checkIntRange(0, 255, entry.getIntValue());
|
||||||
levels.putInt(Enchantments1_20_3.idToKey(entry.getIntKey()), level);
|
levels.putInt(Enchantments1_20_5.idToKey(entry.getIntKey()), level);
|
||||||
}
|
}
|
||||||
tag.put("levels", levels);
|
tag.put("levels", levels);
|
||||||
if (!value.showInTooltip()) {
|
if (!value.showInTooltip()) {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren