Added mob spawner block entity data (#587)

This commit is contained in:
rtm516 2020-05-18 05:35:01 +01:00 committed by GitHub
parent 43ee7d6027
commit 405ffb2666
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 117 additions and 0 deletions

View file

@ -160,6 +160,8 @@ public enum EntityType {
*/ */
ILLUSIONER(AbstractIllagerEntity.class, 114, 1.8f, 0.6f, 0.6f, 1.62f, "minecraft:pillager"); ILLUSIONER(AbstractIllagerEntity.class, 114, 1.8f, 0.6f, 0.6f, 1.62f, "minecraft:pillager");
private static final EntityType[] VALUES = values();
private Class<? extends Entity> entityClass; private Class<? extends Entity> entityClass;
private final int type; private final int type;
private final float height; private final float height;
@ -195,4 +197,14 @@ public enum EntityType {
this.offset = offset + 0.00001f; this.offset = offset + 0.00001f;
this.identifier = identifier; this.identifier = identifier;
} }
public static EntityType getFromIdentifier(String identifier) {
for (EntityType type : VALUES) {
if (type.identifier.equals(identifier)) {
return type;
}
}
return null;
}
} }

View file

@ -0,0 +1,105 @@
/*
* 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.network.translators.world.block.entity;
import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.nukkitx.nbt.CompoundTagBuilder;
import com.nukkitx.nbt.tag.*;
import org.geysermc.connector.entity.type.EntityType;
import java.util.ArrayList;
import java.util.List;
@BlockEntity(name = "MobSpawner", regex = "mob_spawner")
public class SpawnerBlockEntityTranslator extends BlockEntityTranslator {
@Override
public List<Tag<?>> translateTag(CompoundTag tag, BlockState blockState) {
List<Tag<?>> tags = new ArrayList<>();
if (tag.get("MaxNearbyEntities") != null) {
tags.add(new ShortTag("MaxNearbyEntities", (short) tag.get("MaxNearbyEntities").getValue()));
}
if (tag.get("RequiredPlayerRange") != null) {
tags.add(new ShortTag("RequiredPlayerRange", (short) tag.get("RequiredPlayerRange").getValue()));
}
if (tag.get("SpawnCount") != null) {
tags.add(new ShortTag("SpawnCount", (short) tag.get("SpawnCount").getValue()));
}
if (tag.get("MaxSpawnDelay") != null) {
tags.add(new ShortTag("MaxSpawnDelay", (short) tag.get("MaxSpawnDelay").getValue()));
}
if (tag.get("Delay") != null) {
tags.add(new ShortTag("Delay", (short) tag.get("Delay").getValue()));
}
if (tag.get("SpawnRange") != null) {
tags.add(new ShortTag("SpawnRange", (short) tag.get("SpawnRange").getValue()));
}
if (tag.get("MinSpawnDelay") != null) {
tags.add(new ShortTag("MinSpawnDelay", (short) tag.get("MinSpawnDelay").getValue()));
}
if (tag.get("SpawnData") != null) {
CompoundTag spawnData = tag.get("SpawnData");
String entityID = (String) spawnData.get("id").getValue();
tags.add(new StringTag("EntityIdentifier", entityID));
EntityType type = EntityType.getFromIdentifier(entityID);
if (type != null) {
tags.add(new FloatTag("DisplayEntityWidth", type.getWidth()));
tags.add(new FloatTag("DisplayEntityHeight", type.getHeight()));
tags.add(new FloatTag("DisplayEntityScale", 1.0f));
}
}
tags.add(new StringTag("id", "MobSpawner"));
tags.add(new ByteTag("isMovable", (byte) 1));
return tags;
}
@Override
public CompoundTag getDefaultJavaTag(String javaId, int x, int y, int z) {
return null;
}
@Override
public com.nukkitx.nbt.tag.CompoundTag getDefaultBedrockTag(String bedrockId, int x, int y, int z) {
CompoundTagBuilder tagBuilder = getConstantBedrockTag(bedrockId, x, y, z).toBuilder();
tagBuilder.byteTag("isMovable", (byte) 1)
.stringTag("id", "MobSpawner");
return tagBuilder.buildRootTag();
}
}