mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
New potions and merge potion enums
This commit is contained in:
Camotoy
parent
fcdd1b91a1
commit
4ee9dd5d17
5 changed files with 104 additions and 213 deletions
|
|
@ -28,7 +28,7 @@ package org.geysermc.geyser.entity.type;
|
|||
import org.cloudburstmc.math.vector.Vector3f;
|
||||
import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
|
||||
import org.geysermc.geyser.entity.EntityDefinition;
|
||||
import org.geysermc.geyser.inventory.item.TippedArrowPotion;
|
||||
import org.geysermc.geyser.inventory.item.Potion;
|
||||
import org.geysermc.geyser.session.GeyserSession;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
|
||||
|
||||
|
|
@ -46,12 +46,7 @@ public class ArrowEntity extends AbstractArrowEntity {
|
|||
if (potionColor == -1) {
|
||||
dirtyMetadata.put(EntityDataTypes.CUSTOM_DISPLAY, (byte) 0);
|
||||
} else {
|
||||
TippedArrowPotion potion = TippedArrowPotion.getByJavaColor(potionColor);
|
||||
if (potion != null && potion.getJavaColor() != -1) {
|
||||
dirtyMetadata.put(EntityDataTypes.CUSTOM_DISPLAY, (byte) potion.getBedrockId());
|
||||
} else {
|
||||
dirtyMetadata.put(EntityDataTypes.CUSTOM_DISPLAY, (byte) 0);
|
||||
}
|
||||
dirtyMetadata.put(EntityDataTypes.CUSTOM_DISPLAY, Potion.toTippedArrowId(potionColor));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,57 +34,68 @@ import java.util.Locale;
|
|||
|
||||
@Getter
|
||||
public enum Potion {
|
||||
WATER(0),
|
||||
MUNDANE(1),
|
||||
THICK(3),
|
||||
AWKWARD(4),
|
||||
NIGHT_VISION(5),
|
||||
LONG_NIGHT_VISION(6),
|
||||
INVISIBILITY(7),
|
||||
LONG_INVISIBILITY(8),
|
||||
LEAPING(9),
|
||||
LONG_LEAPING(10),
|
||||
STRONG_LEAPING(11),
|
||||
FIRE_RESISTANCE(12),
|
||||
LONG_FIRE_RESISTANCE(13),
|
||||
SWIFTNESS(14),
|
||||
LONG_SWIFTNESS(15),
|
||||
STRONG_SWIFTNESS(16),
|
||||
SLOWNESS(17),
|
||||
LONG_SLOWNESS(18),
|
||||
STRONG_SLOWNESS(42),
|
||||
TURTLE_MASTER(37),
|
||||
LONG_TURTLE_MASTER(38),
|
||||
STRONG_TURTLE_MASTER(39),
|
||||
WATER_BREATHING(19),
|
||||
LONG_WATER_BREATHING(20),
|
||||
HEALING(21),
|
||||
STRONG_HEALING(22),
|
||||
HARMING(23),
|
||||
STRONG_HARMING(24),
|
||||
POISON(25),
|
||||
LONG_POISON(26),
|
||||
STRONG_POISON(27),
|
||||
REGENERATION(28),
|
||||
LONG_REGENERATION(29),
|
||||
STRONG_REGENERATION(30),
|
||||
STRENGTH(31),
|
||||
LONG_STRENGTH(32),
|
||||
STRONG_STRENGTH(33),
|
||||
WEAKNESS(34),
|
||||
LONG_WEAKNESS(35),
|
||||
LUCK(2), //does not exist
|
||||
SLOW_FALLING(40),
|
||||
LONG_SLOW_FALLING(41);
|
||||
WATER(0, ArrowParticleColors.NONE),
|
||||
MUNDANE(1, ArrowParticleColors.NONE), // 2 is extended?
|
||||
THICK(3, ArrowParticleColors.NONE),
|
||||
AWKWARD(4, ArrowParticleColors.NONE),
|
||||
NIGHT_VISION(5, ArrowParticleColors.NIGHT_VISION),
|
||||
LONG_NIGHT_VISION(6, ArrowParticleColors.NIGHT_VISION),
|
||||
INVISIBILITY(7, ArrowParticleColors.INVISIBILITY),
|
||||
LONG_INVISIBILITY(8, ArrowParticleColors.INVISIBILITY),
|
||||
LEAPING(9, ArrowParticleColors.LEAPING),
|
||||
LONG_LEAPING(10, ArrowParticleColors.LEAPING),
|
||||
STRONG_LEAPING(11, ArrowParticleColors.LEAPING),
|
||||
FIRE_RESISTANCE(12, ArrowParticleColors.FIRE_RESISTANCE),
|
||||
LONG_FIRE_RESISTANCE(13, ArrowParticleColors.FIRE_RESISTANCE),
|
||||
SWIFTNESS(14, ArrowParticleColors.SWIFTNESS),
|
||||
LONG_SWIFTNESS(15, ArrowParticleColors.SWIFTNESS),
|
||||
STRONG_SWIFTNESS(16, ArrowParticleColors.SWIFTNESS),
|
||||
SLOWNESS(17, ArrowParticleColors.SLOWNESS),
|
||||
LONG_SLOWNESS(18, ArrowParticleColors.SLOWNESS),
|
||||
STRONG_SLOWNESS(42, ArrowParticleColors.SLOWNESS),
|
||||
TURTLE_MASTER(37, ArrowParticleColors.TURTLE_MASTER),
|
||||
LONG_TURTLE_MASTER(38, ArrowParticleColors.TURTLE_MASTER),
|
||||
STRONG_TURTLE_MASTER(39, ArrowParticleColors.TURTLE_MASTER),
|
||||
WATER_BREATHING(19, ArrowParticleColors.WATER_BREATHING),
|
||||
LONG_WATER_BREATHING(20, ArrowParticleColors.WATER_BREATHING),
|
||||
HEALING(21, ArrowParticleColors.HEALING),
|
||||
STRONG_HEALING(22, ArrowParticleColors.HEALING),
|
||||
HARMING(23, ArrowParticleColors.HARMING),
|
||||
STRONG_HARMING(24, ArrowParticleColors.HARMING),
|
||||
POISON(25, ArrowParticleColors.POISON),
|
||||
LONG_POISON(26, ArrowParticleColors.POISON),
|
||||
STRONG_POISON(27, ArrowParticleColors.POISON),
|
||||
REGENERATION(28, ArrowParticleColors.REGENERATION),
|
||||
LONG_REGENERATION(29, ArrowParticleColors.REGENERATION),
|
||||
STRONG_REGENERATION(30, ArrowParticleColors.REGENERATION),
|
||||
STRENGTH(31, ArrowParticleColors.STRENGTH),
|
||||
LONG_STRENGTH(32, ArrowParticleColors.STRENGTH),
|
||||
STRONG_STRENGTH(33, ArrowParticleColors.STRENGTH),
|
||||
WEAKNESS(34, ArrowParticleColors.WEAKNESS),
|
||||
LONG_WEAKNESS(35, ArrowParticleColors.WEAKNESS),
|
||||
LUCK(2, ArrowParticleColors.NONE), // does not exist in Bedrock
|
||||
SLOW_FALLING(40, ArrowParticleColors.SLOW_FALLING),
|
||||
LONG_SLOW_FALLING(41, ArrowParticleColors.SLOW_FALLING),
|
||||
WIND_CHARGING(43, ArrowParticleColors.WIND_CHARGING),
|
||||
WEAVING(44, ArrowParticleColors.WEAVING),
|
||||
OOZING(45, ArrowParticleColors.OOZING),
|
||||
INFESTATION(46, ArrowParticleColors.INFESTATION);
|
||||
|
||||
public static final Potion[] VALUES = values();
|
||||
|
||||
private final String javaIdentifier;
|
||||
private final short bedrockId;
|
||||
private final int javaColor;
|
||||
|
||||
Potion(int bedrockId) {
|
||||
Potion(int bedrockId, int javaColor) {
|
||||
this.javaIdentifier = "minecraft:" + this.name().toLowerCase(Locale.ENGLISH);
|
||||
this.bedrockId = (short) bedrockId;
|
||||
this.javaColor = javaColor;
|
||||
}
|
||||
|
||||
public int tippedArrowId() {
|
||||
// +1 likely to offset 0 as nothing?
|
||||
return this.bedrockId + 1;
|
||||
}
|
||||
|
||||
public PotionContents toComponent() {
|
||||
|
|
@ -106,4 +117,44 @@ public enum Potion {
|
|||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static @Nullable Potion getByTippedArrowDamage(int bedrockId) {
|
||||
return getByBedrockId(bedrockId - 1);
|
||||
}
|
||||
|
||||
public static byte toTippedArrowId(int javaParticleColor) {
|
||||
for (Potion potion : VALUES) {
|
||||
if (potion.javaColor == javaParticleColor) {
|
||||
return (byte) (potion.bedrockId + 1);
|
||||
}
|
||||
}
|
||||
return (byte) 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* For tipped arrow usage
|
||||
*/
|
||||
private static final class ArrowParticleColors {
|
||||
static final int NONE = 1;
|
||||
static final int NIGHT_VISION = 2039713;
|
||||
static final int INVISIBILITY = 8356754;
|
||||
static final int LEAPING = 2293580;
|
||||
static final int FIRE_RESISTANCE = 14981690;
|
||||
static final int SWIFTNESS = 8171462;
|
||||
static final int SLOWNESS = 5926017;
|
||||
static final int TURTLE_MASTER = 7691106;
|
||||
static final int WATER_BREATHING = 3035801;
|
||||
static final int HEALING = 16262179;
|
||||
static final int HARMING = 4393481;
|
||||
static final int POISON = 5149489;
|
||||
static final int REGENERATION = 13458603;
|
||||
static final int STRENGTH = 9643043;
|
||||
static final int WEAKNESS = 4738376;
|
||||
static final int LUCK = 3381504;
|
||||
static final int SLOW_FALLING = 16773073;
|
||||
static final int WIND_CHARGING = 12438015;
|
||||
static final int WEAVING = 7891290;
|
||||
static final int OOZING = 10092451;
|
||||
static final int INFESTATION = 9214860;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,153 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
* @author GeyserMC
|
||||
* @link https://github.com/GeyserMC/Geyser
|
||||
*/
|
||||
|
||||
package org.geysermc.geyser.inventory.item;
|
||||
|
||||
import lombok.Getter;
|
||||
import org.checkerframework.checker.nullness.qual.Nullable;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* Potion identifiers and their respective Bedrock IDs used with arrows.
|
||||
* <a href="https://minecraft.wiki/w/Arrow#Data_values">See here</a>
|
||||
*/
|
||||
@Getter
|
||||
public enum TippedArrowPotion {
|
||||
WATER(-1, ArrowParticleColors.NONE), // Guessing this based off of the Potion enum. TODO merge?
|
||||
MUNDANE(2, ArrowParticleColors.NONE), // 3 is extended?
|
||||
THICK(4, ArrowParticleColors.NONE),
|
||||
AWKWARD(5, ArrowParticleColors.NONE),
|
||||
NIGHT_VISION(6, ArrowParticleColors.NIGHT_VISION),
|
||||
LONG_NIGHT_VISION(7, ArrowParticleColors.NIGHT_VISION),
|
||||
INVISIBILITY(8, ArrowParticleColors.INVISIBILITY),
|
||||
LONG_INVISIBILITY(9, ArrowParticleColors.INVISIBILITY),
|
||||
LEAPING(10, ArrowParticleColors.LEAPING),
|
||||
LONG_LEAPING(11, ArrowParticleColors.LEAPING),
|
||||
STRONG_LEAPING(12, ArrowParticleColors.LEAPING),
|
||||
FIRE_RESISTANCE(13, ArrowParticleColors.FIRE_RESISTANCE),
|
||||
LONG_FIRE_RESISTANCE(14, ArrowParticleColors.FIRE_RESISTANCE),
|
||||
SWIFTNESS(15, ArrowParticleColors.SWIFTNESS),
|
||||
LONG_SWIFTNESS(16, ArrowParticleColors.SWIFTNESS),
|
||||
STRONG_SWIFTNESS(17, ArrowParticleColors.SWIFTNESS),
|
||||
SLOWNESS(18, ArrowParticleColors.SLOWNESS),
|
||||
LONG_SLOWNESS(19, ArrowParticleColors.SLOWNESS),
|
||||
STRONG_SLOWNESS(43, ArrowParticleColors.SLOWNESS),
|
||||
WATER_BREATHING(20, ArrowParticleColors.WATER_BREATHING),
|
||||
LONG_WATER_BREATHING(21, ArrowParticleColors.WATER_BREATHING),
|
||||
HEALING(22, ArrowParticleColors.HEALING),
|
||||
STRONG_HEALING(23, ArrowParticleColors.HEALING),
|
||||
HARMING(24, ArrowParticleColors.HARMING),
|
||||
STRONG_HARMING(25, ArrowParticleColors.HARMING),
|
||||
POISON(26, ArrowParticleColors.POISON),
|
||||
LONG_POISON(27, ArrowParticleColors.POISON),
|
||||
STRONG_POISON(28, ArrowParticleColors.POISON),
|
||||
REGENERATION(29, ArrowParticleColors.REGENERATION),
|
||||
LONG_REGENERATION(30, ArrowParticleColors.REGENERATION),
|
||||
STRONG_REGENERATION(31, ArrowParticleColors.REGENERATION),
|
||||
STRENGTH(32, ArrowParticleColors.STRENGTH),
|
||||
LONG_STRENGTH(33, ArrowParticleColors.STRENGTH),
|
||||
STRONG_STRENGTH(34, ArrowParticleColors.STRENGTH),
|
||||
WEAKNESS(35, ArrowParticleColors.WEAKNESS),
|
||||
LONG_WEAKNESS(36, ArrowParticleColors.WEAKNESS),
|
||||
LUCK(2, ArrowParticleColors.NONE), // does not exist in Bedrock
|
||||
TURTLE_MASTER(38, ArrowParticleColors.TURTLE_MASTER),
|
||||
LONG_TURTLE_MASTER(39, ArrowParticleColors.TURTLE_MASTER),
|
||||
STRONG_TURTLE_MASTER(40, ArrowParticleColors.TURTLE_MASTER),
|
||||
SLOW_FALLING(41, ArrowParticleColors.SLOW_FALLING),
|
||||
LONG_SLOW_FALLING(42, ArrowParticleColors.SLOW_FALLING);
|
||||
|
||||
private static final TippedArrowPotion[] VALUES = values();
|
||||
|
||||
private final String javaIdentifier;
|
||||
private final short bedrockId;
|
||||
/**
|
||||
* The Java color associated with this ID.
|
||||
* Used for looking up Java arrow color entity metadata as Bedrock potion IDs, which is what is used for entities in Bedrock
|
||||
*/
|
||||
private final int javaColor;
|
||||
|
||||
TippedArrowPotion(int bedrockId, ArrowParticleColors arrowParticleColor) {
|
||||
this.javaIdentifier = "minecraft:" + this.name().toLowerCase(Locale.ENGLISH);
|
||||
this.bedrockId = (short) bedrockId;
|
||||
this.javaColor = arrowParticleColor.getColor();
|
||||
}
|
||||
|
||||
public static @Nullable TippedArrowPotion of(int id) {
|
||||
if (id >= 0 && id < VALUES.length) {
|
||||
return VALUES[id];
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static @Nullable TippedArrowPotion getByBedrockId(int bedrockId) {
|
||||
for (TippedArrowPotion potion : VALUES) {
|
||||
if (potion.bedrockId == bedrockId) {
|
||||
return potion;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param color the potion color to look up
|
||||
* @return the tipped arrow potion that most closely resembles that color.
|
||||
*/
|
||||
public static @Nullable TippedArrowPotion getByJavaColor(int color) {
|
||||
for (TippedArrowPotion potion : VALUES) {
|
||||
if (potion.javaColor == color) {
|
||||
return potion;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private enum ArrowParticleColors {
|
||||
NONE(-1),
|
||||
NIGHT_VISION(2039713),
|
||||
INVISIBILITY(8356754),
|
||||
LEAPING(2293580),
|
||||
FIRE_RESISTANCE(14981690),
|
||||
SWIFTNESS(8171462),
|
||||
SLOWNESS(5926017),
|
||||
TURTLE_MASTER(7691106),
|
||||
WATER_BREATHING(3035801),
|
||||
HEALING(16262179),
|
||||
HARMING(4393481),
|
||||
POISON(5149489),
|
||||
REGENERATION(13458603),
|
||||
STRENGTH(9643043),
|
||||
WEAKNESS(4738376),
|
||||
LUCK(3381504),
|
||||
SLOW_FALLING(16773073);
|
||||
|
||||
@Getter
|
||||
private final int color;
|
||||
|
||||
ArrowParticleColors(int color) {
|
||||
this.color = color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -28,15 +28,13 @@ package org.geysermc.geyser.item.type;
|
|||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
|
||||
import org.geysermc.geyser.inventory.GeyserItemStack;
|
||||
import org.geysermc.geyser.inventory.item.TippedArrowPotion;
|
||||
import org.geysermc.geyser.inventory.item.Potion;
|
||||
import org.geysermc.geyser.item.Items;
|
||||
import org.geysermc.geyser.registry.type.ItemMapping;
|
||||
import org.geysermc.geyser.registry.type.ItemMappings;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.item.component.PotionContents;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
public class ArrowItem extends Item {
|
||||
public ArrowItem(String javaIdentifier, Builder builder) {
|
||||
super(javaIdentifier, builder);
|
||||
|
|
@ -44,11 +42,11 @@ public class ArrowItem extends Item {
|
|||
|
||||
@Override
|
||||
public @NonNull GeyserItemStack translateToJava(@NonNull ItemData itemData, @NonNull ItemMapping mapping, @NonNull ItemMappings mappings) {
|
||||
TippedArrowPotion tippedArrowPotion = TippedArrowPotion.getByBedrockId(itemData.getDamage());
|
||||
Potion potion = Potion.getByTippedArrowDamage(itemData.getDamage());
|
||||
GeyserItemStack itemStack = super.translateToJava(itemData, mapping, mappings);
|
||||
if (tippedArrowPotion != null) {
|
||||
if (potion != null) {
|
||||
itemStack = Items.TIPPED_ARROW.newItemStack(itemStack.getAmount(), itemStack.getComponents());
|
||||
PotionContents contents = new PotionContents(tippedArrowPotion.ordinal(), -1, Collections.emptyList());
|
||||
PotionContents contents = potion.toComponent();
|
||||
itemStack.getOrCreateComponents().put(DataComponentType.POTION_CONTENTS, contents);
|
||||
}
|
||||
return itemStack;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ package org.geysermc.geyser.item.type;
|
|||
|
||||
import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
|
||||
import org.geysermc.geyser.GeyserImpl;
|
||||
import org.geysermc.geyser.inventory.item.TippedArrowPotion;
|
||||
import org.geysermc.geyser.inventory.item.Potion;
|
||||
import org.geysermc.geyser.registry.type.ItemMapping;
|
||||
import org.geysermc.geyser.registry.type.ItemMappings;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponentType;
|
||||
|
|
@ -44,11 +44,11 @@ public class TippedArrowItem extends ArrowItem {
|
|||
if (components != null) {
|
||||
PotionContents potionContents = components.get(DataComponentType.POTION_CONTENTS);
|
||||
if (potionContents != null) {
|
||||
TippedArrowPotion tippedArrowPotion = TippedArrowPotion.of(potionContents.getPotionId());
|
||||
if (tippedArrowPotion != null) {
|
||||
Potion potion = Potion.getByJavaId(potionContents.getPotionId());
|
||||
if (potion != null) {
|
||||
return ItemData.builder()
|
||||
.definition(mapping.getBedrockDefinition())
|
||||
.damage(tippedArrowPotion.getBedrockId())
|
||||
.damage(potion.tippedArrowId())
|
||||
.count(count);
|
||||
}
|
||||
GeyserImpl.getInstance().getLogger().debug("Unknown Java potion (tipped arrow): " + potionContents.getPotionId());
|
||||
|
|
|
|||
Loading…
Reference in a new issue