forked from GeyserMC/Geyser
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/plugins' into bleeding
# Conflicts: # connector/src/main/java/org/geysermc/connector/network/translators/world/block/BlockTranslator.java # connector/src/main/java/org/geysermc/connector/skin/SkinManager.java
- Loading branch information
Showing
28 changed files
with
396 additions
and
108 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
connector/src/main/java/org/geysermc/connector/entity/ThrownPotionEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| /* | ||
| * Copyright (c) 2019-2020 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.connector.entity; | ||
|
|
||
| import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata; | ||
| import com.github.steveice10.mc.protocol.data.game.entity.metadata.ItemStack; | ||
| import com.github.steveice10.mc.protocol.data.game.entity.metadata.MetadataType; | ||
| import com.github.steveice10.opennbt.tag.builtin.StringTag; | ||
| import com.github.steveice10.opennbt.tag.builtin.Tag; | ||
| import com.nukkitx.math.vector.Vector3f; | ||
| import com.nukkitx.protocol.bedrock.data.entity.EntityData; | ||
| import com.nukkitx.protocol.bedrock.data.entity.EntityFlag; | ||
| import org.geysermc.connector.GeyserConnector; | ||
| import org.geysermc.connector.entity.type.EntityType; | ||
| import org.geysermc.connector.network.session.GeyserSession; | ||
| import org.geysermc.connector.network.translators.item.ItemEntry; | ||
| import org.geysermc.connector.network.translators.item.ItemRegistry; | ||
| import org.geysermc.connector.network.translators.item.Potion; | ||
|
|
||
| import java.util.EnumSet; | ||
|
|
||
| public class ThrownPotionEntity extends ThrowableEntity { | ||
| private static final EnumSet<Potion> NON_ENCHANTED_POTIONS = EnumSet.of(Potion.WATER, Potion.MUNDANE, Potion.THICK, Potion.AWKWARD); | ||
|
|
||
| public ThrownPotionEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) { | ||
| super(entityId, geyserId, entityType, position, motion, rotation); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) { | ||
| if (entityMetadata.getId() == 7 && entityMetadata.getType() == MetadataType.ITEM) { | ||
| ItemStack itemStack = (ItemStack) entityMetadata.getValue(); | ||
| ItemEntry itemEntry = ItemRegistry.getItem(itemStack); | ||
| if (itemEntry.getJavaIdentifier().endsWith("potion") && itemStack.getNbt() != null) { | ||
| Tag potionTag = itemStack.getNbt().get("Potion"); | ||
| if (potionTag instanceof StringTag) { | ||
| Potion potion = Potion.getByJavaIdentifier(((StringTag) potionTag).getValue()); | ||
| if (potion != null) { | ||
| metadata.put(EntityData.POTION_AUX_VALUE, potion.getBedrockId()); | ||
| metadata.getFlags().setFlag(EntityFlag.ENCHANTED, !NON_ENCHANTED_POTIONS.contains(potion)); | ||
| } else { | ||
| metadata.put(EntityData.POTION_AUX_VALUE, 0); | ||
| GeyserConnector.getInstance().getLogger().debug("Unknown java potion: " + potionTag.getValue()); | ||
| } | ||
| } | ||
|
|
||
| boolean isLingering = itemEntry.getJavaIdentifier().equals("minecraft:lingering_potion"); | ||
| metadata.getFlags().setFlag(EntityFlag.LINGERING, isLingering); | ||
| } | ||
| } | ||
|
|
||
| super.updateBedrockMetadata(entityMetadata, session); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.