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 'u/master' into feature/smoothness
- Loading branch information
Showing
45 changed files
with
775 additions
and
196 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
88 changes: 88 additions & 0 deletions
88
connector/src/main/java/org/geysermc/connector/entity/DefaultBlockMinecartEntity.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,88 @@ | ||
| /* | ||
| * 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.nukkitx.math.vector.Vector3f; | ||
| import com.nukkitx.protocol.bedrock.data.EntityData; | ||
| import org.geysermc.connector.entity.type.EntityType; | ||
| import org.geysermc.connector.network.session.GeyserSession; | ||
| import org.geysermc.connector.network.translators.world.block.BlockTranslator; | ||
|
|
||
| /** | ||
| * This class is used as a base for minecarts with a default block to display like furnaces and spawners | ||
| */ | ||
| public class DefaultBlockMinecartEntity extends MinecartEntity { | ||
|
|
||
| public int customBlock = 0; | ||
| public int customBlockOffset = 0; | ||
| public boolean showCustomBlock = false; | ||
|
|
||
| public DefaultBlockMinecartEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) { | ||
| super(entityId, geyserId, entityType, position, motion, rotation); | ||
|
|
||
| updateDefaultBlockMetadata(); | ||
| metadata.put(EntityData.HAS_DISPLAY, (byte) 1); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateBedrockMetadata(EntityMetadata entityMetadata, GeyserSession session) { | ||
|
|
||
| // Custom block | ||
| if (entityMetadata.getId() == 10) { | ||
| customBlock = (int) entityMetadata.getValue(); | ||
|
|
||
| if (showCustomBlock) { | ||
| metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId(customBlock)); | ||
| } | ||
| } | ||
|
|
||
| // Custom block offset | ||
| if (entityMetadata.getId() == 11) { | ||
| customBlockOffset = (int) entityMetadata.getValue(); | ||
|
|
||
| if (showCustomBlock) { | ||
| metadata.put(EntityData.DISPLAY_OFFSET, customBlockOffset); | ||
| } | ||
| } | ||
|
|
||
| // If the custom block should be enabled | ||
| if (entityMetadata.getId() == 12) { | ||
| if ((boolean) entityMetadata.getValue()) { | ||
| showCustomBlock = true; | ||
| metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId(customBlock)); | ||
| metadata.put(EntityData.DISPLAY_OFFSET, customBlockOffset); | ||
| } else { | ||
| showCustomBlock = false; | ||
| updateDefaultBlockMetadata(); | ||
| } | ||
| } | ||
|
|
||
| super.updateBedrockMetadata(entityMetadata, session); | ||
| } | ||
|
|
||
| public void updateDefaultBlockMetadata() { } | ||
| } |
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
58 changes: 58 additions & 0 deletions
58
connector/src/main/java/org/geysermc/connector/entity/FurnaceMinecartEntity.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,58 @@ | ||
| /* | ||
| * 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.nukkitx.math.vector.Vector3f; | ||
| import com.nukkitx.protocol.bedrock.data.EntityData; | ||
| import org.geysermc.connector.entity.type.EntityType; | ||
| import org.geysermc.connector.network.session.GeyserSession; | ||
| import org.geysermc.connector.network.translators.world.block.BlockTranslator; | ||
|
|
||
| public class FurnaceMinecartEntity extends DefaultBlockMinecartEntity { | ||
|
|
||
| private boolean hasFuel = false; | ||
|
|
||
| public FurnaceMinecartEntity(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() == 13 && !showCustomBlock) { | ||
| hasFuel = (boolean) entityMetadata.getValue(); | ||
| updateDefaultBlockMetadata(); | ||
| } | ||
|
|
||
| super.updateBedrockMetadata(entityMetadata, session); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateDefaultBlockMetadata() { | ||
| metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId(hasFuel ? BlockTranslator.JAVA_RUNTIME_FURNACE_LIT_ID : BlockTranslator.JAVA_RUNTIME_FURNACE_ID)); | ||
| metadata.put(EntityData.DISPLAY_OFFSET, 6); | ||
| } | ||
| } |
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
44 changes: 44 additions & 0 deletions
44
connector/src/main/java/org/geysermc/connector/entity/SpawnerMinecartEntity.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,44 @@ | ||
| /* | ||
| * 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.nukkitx.math.vector.Vector3f; | ||
| import com.nukkitx.protocol.bedrock.data.EntityData; | ||
| import org.geysermc.connector.entity.type.EntityType; | ||
| import org.geysermc.connector.network.translators.world.block.BlockTranslator; | ||
|
|
||
| public class SpawnerMinecartEntity extends DefaultBlockMinecartEntity { | ||
|
|
||
| public SpawnerMinecartEntity(long entityId, long geyserId, EntityType entityType, Vector3f position, Vector3f motion, Vector3f rotation) { | ||
| super(entityId, geyserId, entityType, position, motion, rotation); | ||
| } | ||
|
|
||
| @Override | ||
| public void updateDefaultBlockMetadata() { | ||
| metadata.put(EntityData.DISPLAY_ITEM, BlockTranslator.getBedrockBlockId(BlockTranslator.JAVA_RUNTIME_SPAWNER_ID)); | ||
| metadata.put(EntityData.DISPLAY_OFFSET, 6); | ||
| } | ||
| } |
Oops, something went wrong.