forked from GeyserMC/Geyser
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement allay, plus some interaction fixes
- Loading branch information
Showing
30 changed files
with
258 additions
and
101 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
core/src/main/java/org/geysermc/geyser/entity/ChestBoatEntity.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,51 @@ | ||
| /* | ||
| * 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.entity; | ||
|
|
||
| import com.github.steveice10.mc.protocol.data.game.entity.player.Hand; | ||
| import com.nukkitx.math.vector.Vector3f; | ||
| import org.geysermc.geyser.entity.type.BoatEntity; | ||
| import org.geysermc.geyser.session.GeyserSession; | ||
| import org.geysermc.geyser.util.InteractionResult; | ||
| import org.geysermc.geyser.util.InteractiveTag; | ||
|
|
||
| import java.util.UUID; | ||
|
|
||
| public class ChestBoatEntity extends BoatEntity { | ||
| public ChestBoatEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) { | ||
| super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw); | ||
| } | ||
|
|
||
| @Override | ||
| protected InteractiveTag testInteraction(Hand hand) { | ||
| return passengers.isEmpty() && !session.isSneaking() ? super.testInteraction(hand) : InteractiveTag.OPEN_CONTAINER; | ||
| } | ||
|
|
||
| @Override | ||
| public InteractionResult interact(Hand hand) { | ||
| return passengers.isEmpty() && !session.isSneaking() ? super.interact(hand) : InteractionResult.SUCCESS; | ||
| } | ||
| } |
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
70 changes: 70 additions & 0 deletions
70
core/src/main/java/org/geysermc/geyser/entity/type/living/AllayEntity.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,70 @@ | ||
| /* | ||
| * 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.entity.type.living; | ||
|
|
||
| import com.github.steveice10.mc.protocol.data.game.entity.player.Hand; | ||
| import com.nukkitx.math.vector.Vector3f; | ||
| import org.geysermc.geyser.entity.EntityDefinition; | ||
| import org.geysermc.geyser.inventory.GeyserItemStack; | ||
| import org.geysermc.geyser.session.GeyserSession; | ||
| import org.geysermc.geyser.util.InteractionResult; | ||
| import org.geysermc.geyser.util.InteractiveTag; | ||
|
|
||
| import javax.annotation.Nonnull; | ||
| import java.util.UUID; | ||
|
|
||
| public class AllayEntity extends MobEntity { | ||
| public AllayEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) { | ||
| super(session, entityId, geyserId, uuid, definition, position, motion, yaw, pitch, headYaw); | ||
| } | ||
|
|
||
| @Nonnull | ||
| @Override | ||
| protected InteractiveTag testMobInteraction(@Nonnull Hand hand, @Nonnull GeyserItemStack itemInHand) { | ||
| if (!this.hand.isValid() && !itemInHand.isEmpty()) { | ||
| return InteractiveTag.GIVE_ITEM_TO_ALLAY; | ||
| } else if (this.hand.isValid() && hand == Hand.MAIN_HAND && itemInHand.isEmpty()) { | ||
| // Seems like there isn't a good tag for this yet | ||
| return InteractiveTag.GIVE_ITEM_TO_ALLAY; | ||
| } else { | ||
| return super.testMobInteraction(hand, itemInHand); | ||
| } | ||
| } | ||
|
|
||
| @Nonnull | ||
| @Override | ||
| protected InteractionResult mobInteract(@Nonnull Hand hand, @Nonnull GeyserItemStack itemInHand) { | ||
| if (!this.hand.isValid() && !itemInHand.isEmpty()) { | ||
| //TODO play sound? | ||
| return InteractionResult.SUCCESS; | ||
| } else if (this.hand.isValid() && hand == Hand.MAIN_HAND && itemInHand.isEmpty()) { | ||
| //TOCHECK also play sound here? | ||
| return InteractionResult.SUCCESS; | ||
| } else { | ||
| return super.mobInteract(hand, itemInHand); | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.