AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-16 02:45:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/rendering' into rendering

Browse Source
This commit is contained in:
Lukas 2021-02-27 17:20:31 +01:00
commit be6492a137
221 changed files with 1465 additions and 1326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/bixilon/minosoft/config/StaticConfiguration.java
View File

@ -22,6 +22,7 @@ public class StaticConfiguration {
public static final boolean DEBUG_MODE = true; // if true, additional checks will be made to validate data, ... Decreases performance public static final boolean DEBUG_MODE = true; // if true, additional checks will be made to validate data, ... Decreases performance
public static final boolean BIOME_DEBUG_MODE = false; // colors all biomes according to the biome hashCode public static final boolean BIOME_DEBUG_MODE = false; // colors all biomes according to the biome hashCode
public static final boolean DEBUG_SLOW_LOADING = false; // if true, many Thread.sleep will be executed and the start will be delayed (by a lot) public static final boolean DEBUG_SLOW_LOADING = false; // if true, many Thread.sleep will be executed and the start will be delayed (by a lot)
public static final boolean SHOW_LOG_MESSAGES_IN_CHAT = false; // prints all console messages in the chat box
public static String CONFIG_FILENAME = "minosoft.json"; // Filename of minosoft's base configuration (located in AppData/Minosoft/config) public static String CONFIG_FILENAME = "minosoft.json"; // Filename of minosoft's base configuration (located in AppData/Minosoft/config)
public static boolean SKIP_MOJANG_AUTHENTICATION; // disables all connections to mojang public static boolean SKIP_MOJANG_AUTHENTICATION; // disables all connections to mojang
public static boolean COLORED_LOG = true; // the log should be colored with ANSI (does not affect base components) public static boolean COLORED_LOG = true; // the log should be colored with ANSI (does not affect base components)

9
src/main/java/de/bixilon/minosoft/config/config/game/controls/KeyBindingsGameConfig.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.config.config.game.controls package de.bixilon.minosoft.config.config.game.controls
import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEBUG_CLEAR_CHUNK_CACHE
import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEBUG_MOUSE_CATCH import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEBUG_MOUSE_CATCH
import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEBUG_POLYGEN import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEBUG_POLYGEN
import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEBUG_SCREEN import de.bixilon.minosoft.config.config.game.controls.KeyBindingsNames.DEBUG_SCREEN
@ -108,6 +109,13 @@ data class KeyBindingsGameConfig(
), ),
mutableSetOf(mutableSetOf(WHEN_IN_GAME)) mutableSetOf(mutableSetOf(WHEN_IN_GAME))
), ),
DEBUG_CLEAR_CHUNK_CACHE to KeyBinding(
mutableMapOf(
KeyAction.MODIFIER to mutableSetOf(KeyCodes.KEY_F3),
KeyAction.RELEASE to mutableSetOf(KeyCodes.KEY_A)
),
mutableSetOf(mutableSetOf(WHEN_IN_GAME))
),
), ),
) )
@ -125,6 +133,7 @@ object KeyBindingsNames {
val QUIT_RENDERING = ResourceLocation("minosoft:quit_rendering") val QUIT_RENDERING = ResourceLocation("minosoft:quit_rendering")
val DEBUG_SCREEN = ResourceLocation("minosoft:debug_screen") val DEBUG_SCREEN = ResourceLocation("minosoft:debug_screen")
val DEBUG_CLEAR_CHUNK_CACHE = ResourceLocation("minosoft:debug_clear_chunk_cache")
val DEBUG_POLYGEN = ResourceLocation("minosoft:debug_polygen") val DEBUG_POLYGEN = ResourceLocation("minosoft:debug_polygen")
val DEBUG_MOUSE_CATCH = ResourceLocation("minosoft:debug_mouse_catch") val DEBUG_MOUSE_CATCH = ResourceLocation("minosoft:debug_mouse_catch")

10
src/main/java/de/bixilon/minosoft/data/Player.java
View File

@ -39,7 +39,7 @@ public class Player {
private float health; private float health;
private int food; private int food;
private float saturation; private float saturation;
private BlockPosition spawnLocation; private BlockPosition spawnPosition;
private GameModes gameMode; private GameModes gameMode;
private byte selectedSlot; private byte selectedSlot;
private int level; private int level;
@ -105,12 +105,12 @@ public class Player {
this.saturation = saturation; this.saturation = saturation;
} }
public BlockPosition getSpawnLocation() { public BlockPosition getSpawnPosition() {
return this.spawnLocation; return this.spawnPosition;
} }
public void setSpawnLocation(BlockPosition spawnLocation) { public void setSpawnPosition(BlockPosition spawnPosition) {
this.spawnLocation = spawnLocation; this.spawnPosition = spawnPosition;
} }
public GameModes getGameMode() { public GameModes getGameMode() {

4
src/main/java/de/bixilon/minosoft/data/entities/EvokerFangs.java
View File

@ -20,7 +20,7 @@ import java.util.UUID;
public class EvokerFangs extends Entity { public class EvokerFangs extends Entity {
public EvokerFangs(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public EvokerFangs(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/Location.kt → src/main/java/de/bixilon/minosoft/data/entities/Position.kt
View File

@ -16,7 +16,7 @@ import de.bixilon.minosoft.data.world.BlockPosition
import glm_.vec3.Vec3 import glm_.vec3.Vec3
data class Location(val x: Double, val y: Double, val z: Double) { data class Position(val x: Double, val y: Double, val z: Double) {
constructor(position: Vec3) : this(position.x.toDouble(), position.y.toDouble(), position.z.toDouble()) constructor(position: Vec3) : this(position.x.toDouble(), position.y.toDouble(), position.z.toDouble())
@ -34,8 +34,8 @@ data class Location(val x: Double, val y: Double, val z: Double) {
companion object { companion object {
@JvmStatic @JvmStatic
fun fromPosition(position: BlockPosition): Location { fun fromPosition(position: BlockPosition): Position {
return Location(position.x.toDouble(), position.y.toDouble(), position.z.toDouble()) return Position(position.x.toDouble(), position.y.toDouble(), position.z.toDouble())
} }
} }
} }

2
src/main/java/de/bixilon/minosoft/data/entities/RelativeLocation.kt → src/main/java/de/bixilon/minosoft/data/entities/RelativePosition.kt
View File

@ -12,7 +12,7 @@
*/ */
package de.bixilon.minosoft.data.entities package de.bixilon.minosoft.data.entities
data class RelativeLocation(val x: Double, val y: Double, val z: Double) { data class RelativePosition(val x: Double, val y: Double, val z: Double) {
override fun toString(): String { override fun toString(): String {
return "($x $y $z)" return "($x $y $z)"

6
src/main/java/de/bixilon/minosoft/data/entities/entities/AgeableMob.java
View File

@ -15,15 +15,15 @@ package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public abstract class AgeableMob extends PathfinderMob { public abstract class AgeableMob extends PathfinderMob {
public AgeableMob(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AgeableMob(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is baby") @EntityMetaDataFunction(name = "Is baby")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/AreaEffectCloud.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.mappings.particle.data.ParticleData; import de.bixilon.minosoft.data.mappings.particle.data.ParticleData;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class AreaEffectCloud extends Entity { public class AreaEffectCloud extends Entity {
public AreaEffectCloud(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AreaEffectCloud(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Radius") @EntityMetaDataFunction(name = "Radius")

18
src/main/java/de/bixilon/minosoft/data/entities/entities/Entity.java
View File

@ -39,18 +39,18 @@ public abstract class Entity {
protected final HashMap<InventorySlots.EntityInventorySlots, Slot> equipment = new HashMap<>(); protected final HashMap<InventorySlots.EntityInventorySlots, Slot> equipment = new HashMap<>();
protected final HashSet<StatusEffect> effectList = new HashSet<>(); protected final HashSet<StatusEffect> effectList = new HashSet<>();
protected final int versionId; protected final int versionId;
protected Location location; protected Position position;
protected EntityRotation rotation; protected EntityRotation rotation;
protected int attachedTo = -1; protected int attachedTo = -1;
protected EntityMetaData metaData; protected EntityMetaData metaData;
public Entity(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Entity(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
this.connection = connection; this.connection = connection;
this.information = connection.getMapping().getEntityInformation(getClass()); this.information = connection.getMapping().getEntityInformation(getClass());
this.entityId = entityId; this.entityId = entityId;
this.uuid = uuid; this.uuid = uuid;
this.versionId = connection.getVersion().getVersionId(); this.versionId = connection.getVersion().getVersionId();
this.location = location; this.position = position;
this.rotation = rotation; this.rotation = rotation;
} }
@ -58,16 +58,16 @@ public abstract class Entity {
return this.entityId; return this.entityId;
} }
public Location getLocation() { public Position getPosition() {
return this.location; return this.position;
} }
public void setLocation(Location location) { public void setLocation(Position position) {
this.location = location; this.position = position;
} }
public void setLocation(RelativeLocation relativeLocation) { public void setLocation(RelativePosition relativePosition) {
this.location = new Location(this.location.getX() + relativeLocation.getX(), this.location.getY() + relativeLocation.getY(), this.location.getZ() + relativeLocation.getZ()); this.position = new Position(this.position.getX() + relativePosition.getX(), this.position.getY() + relativePosition.getY(), this.position.getZ() + relativePosition.getZ());
} }
public Slot getEquipment(InventorySlots.EntityInventorySlots slot) { public Slot getEquipment(InventorySlots.EntityInventorySlots slot) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/EvokerFangs.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities; package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class EvokerFangs extends Entity { public class EvokerFangs extends Entity {
public EvokerFangs(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public EvokerFangs(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

10
src/main/java/de/bixilon/minosoft/data/entities/entities/ExperienceOrb.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities; package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
@ -22,13 +22,13 @@ import java.util.UUID;
public class ExperienceOrb extends Entity { public class ExperienceOrb extends Entity {
private final int count; private final int count;
public ExperienceOrb(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ExperienceOrb(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
this.count = 0; this.count = 0;
} }
public ExperienceOrb(Connection connection, int entityId, Location location, int count) { public ExperienceOrb(Connection connection, int entityId, Position position, int count) {
super(connection, entityId, UUID.randomUUID(), location, new EntityRotation(0, 0, 0)); super(connection, entityId, UUID.randomUUID(), position, new EntityRotation(0, 0, 0));
this.count = count; this.count = count;
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/FlyingMob.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities; package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public abstract class FlyingMob extends Mob { public abstract class FlyingMob extends Mob {
public FlyingMob(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public FlyingMob(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

10
src/main/java/de/bixilon/minosoft/data/entities/entities/LightningBolt.java
View File

@ -14,18 +14,18 @@
package de.bixilon.minosoft.data.entities.entities; package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class LightningBolt extends Entity { public class LightningBolt extends Entity {
public LightningBolt(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public LightningBolt(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
public LightningBolt(Connection connection, int entityId, Location location) { public LightningBolt(Connection connection, int entityId, Position position) {
super(connection, entityId, UUID.randomUUID(), location, new EntityRotation(0, 0, 0)); super(connection, entityId, UUID.randomUUID(), position, new EntityRotation(0, 0, 0));
} }
} }

8
src/main/java/de/bixilon/minosoft/data/entities/entities/LivingEntity.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.player.Hands; import de.bixilon.minosoft.data.player.Hands;
import de.bixilon.minosoft.data.world.BlockPosition; import de.bixilon.minosoft.data.world.BlockPosition;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -25,8 +25,8 @@ import java.util.UUID;
public abstract class LivingEntity extends Entity { public abstract class LivingEntity extends Entity {
public LivingEntity(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public LivingEntity(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getLivingEntityFlag(int bitMask) { private boolean getLivingEntityFlag(int bitMask) {
@ -76,7 +76,7 @@ public abstract class LivingEntity extends Entity {
@EntityMetaDataFunction(name = "Bed location") @EntityMetaDataFunction(name = "Bed location")
@Nullable @Nullable
public BlockPosition getBedLocation() { public BlockPosition getBedPosition() {
return this.metaData.getSets().getPosition(EntityMetaDataFields.LIVING_ENTITY_BED_POSITION); return this.metaData.getSets().getPosition(EntityMetaDataFields.LIVING_ENTITY_BED_POSITION);
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/Mob.java
View File

@ -15,14 +15,14 @@ package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public abstract class Mob extends LivingEntity { public abstract class Mob extends LivingEntity {
public Mob(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Mob(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getMobFlags(int bitMask) { private boolean getMobFlags(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/PathfinderMob.java
View File

@ -14,15 +14,15 @@
package de.bixilon.minosoft.data.entities.entities; package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public abstract class PathfinderMob extends Mob { public abstract class PathfinderMob extends Mob {
public PathfinderMob(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public PathfinderMob(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/TamableAnimal.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.animal.Animal; import de.bixilon.minosoft.data.entities.entities.animal.Animal;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import javax.annotation.Nullable;
import java.util.UUID; import java.util.UUID;
public abstract class TamableAnimal extends Animal { public abstract class TamableAnimal extends Animal {
public TamableAnimal(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public TamableAnimal(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getTameableFlag(int bitMask) { private boolean getTameableFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/AmbientCreature.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.ambient; package de.bixilon.minosoft.data.entities.entities.ambient;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.Mob; import de.bixilon.minosoft.data.entities.entities.Mob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -22,8 +22,8 @@ import java.util.UUID;
public abstract class AmbientCreature extends Mob { public abstract class AmbientCreature extends Mob {
public AmbientCreature(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AmbientCreature(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/ambient/Bat.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.ambient;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Bat extends AmbientCreature { public class Bat extends AmbientCreature {
public Bat(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Bat(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getBatFlag(int bitMask) { private boolean getBatFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/AbstractGolem.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.animal; package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.PathfinderMob; import de.bixilon.minosoft.data.entities.entities.PathfinderMob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -22,7 +22,7 @@ import java.util.UUID;
public abstract class AbstractGolem extends PathfinderMob { public abstract class AbstractGolem extends PathfinderMob {
public AbstractGolem(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AbstractGolem(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Animal.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.animal; package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.AgeableMob; import de.bixilon.minosoft.data.entities.entities.AgeableMob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -22,8 +22,8 @@ import java.util.UUID;
public abstract class Animal extends AgeableMob { public abstract class Animal extends AgeableMob {
public Animal(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Animal(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Axolotl.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Axolotl extends Animal { public class Axolotl extends Animal {
public Axolotl(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Axolotl(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Axolotl variant") @EntityMetaDataFunction(name = "Axolotl variant")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Bee.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Bee extends Animal { public class Bee extends Animal {
public Bee(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Bee(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getBeeFlag(int bitMask) { private boolean getBeeFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cat.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.TamableAnimal; import de.bixilon.minosoft.data.entities.entities.TamableAnimal;
import de.bixilon.minosoft.data.text.ChatColors; import de.bixilon.minosoft.data.text.ChatColors;
@ -26,8 +26,8 @@ import java.util.UUID;
public class Cat extends TamableAnimal { public class Cat extends TamableAnimal {
public Cat(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Cat(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Variant") @EntityMetaDataFunction(name = "Variant")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Chicken.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal; package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Chicken extends Animal { public class Chicken extends Animal {
public Chicken(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Chicken(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Cow.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal; package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Cow extends Animal { public class Cow extends Animal {
public Cow(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Cow(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Fox.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class Fox extends Animal { public class Fox extends Animal {
public Fox(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Fox(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Variant") @EntityMetaDataFunction(name = "Variant")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/IronGolem.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class IronGolem extends AbstractGolem { public class IronGolem extends AbstractGolem {
public IronGolem(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public IronGolem(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getIronGolemFlag(int bitMask) { private boolean getIronGolemFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Mooshroom.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Mooshroom extends Cow { public class Mooshroom extends Cow {
public Mooshroom(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Mooshroom(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Variant") @EntityMetaDataFunction(name = "Variant")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Ocelot.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Ocelot extends Animal { public class Ocelot extends Animal {
public Ocelot(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Ocelot(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Trusting") @EntityMetaDataFunction(name = "Trusting")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Panda.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Panda extends Animal { public class Panda extends Animal {
public Panda(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Panda(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Unhappy timer") @EntityMetaDataFunction(name = "Unhappy timer")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Parrot.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Parrot extends ShoulderRidingAnimal { public class Parrot extends ShoulderRidingAnimal {
public Parrot(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Parrot(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Variant") @EntityMetaDataFunction(name = "Variant")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Pig.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Pig extends Animal { public class Pig extends Animal {
public Pig(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Pig(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Has saddle") @EntityMetaDataFunction(name = "Has saddle")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/PolarBear.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class PolarBear extends Animal { public class PolarBear extends Animal {
public PolarBear(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public PolarBear(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is standing") @EntityMetaDataFunction(name = "Is standing")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Rabbit.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Rabbit extends Animal { public class Rabbit extends Animal {
public Rabbit(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Rabbit(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Variant") @EntityMetaDataFunction(name = "Variant")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Sheep.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.text.ChatColors; import de.bixilon.minosoft.data.text.ChatColors;
import de.bixilon.minosoft.data.text.RGBColor; import de.bixilon.minosoft.data.text.RGBColor;
@ -25,8 +25,8 @@ import java.util.UUID;
public class Sheep extends Animal { public class Sheep extends Animal {
public Sheep(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Sheep(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Color") @EntityMetaDataFunction(name = "Color")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/ShoulderRidingAnimal.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.animal; package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.TamableAnimal; import de.bixilon.minosoft.data.entities.entities.TamableAnimal;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -22,7 +22,7 @@ import java.util.UUID;
public class ShoulderRidingAnimal extends TamableAnimal { public class ShoulderRidingAnimal extends TamableAnimal {
public ShoulderRidingAnimal(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ShoulderRidingAnimal(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/SnowGolem.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class SnowGolem extends AbstractGolem { public class SnowGolem extends AbstractGolem {
public SnowGolem(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public SnowGolem(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getPumpkinFlags(int bitMask) { private boolean getPumpkinFlags(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Strider.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Strider extends Animal { public class Strider extends Animal {
public Strider(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Strider(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Boost stime") @EntityMetaDataFunction(name = "Boost stime")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Turtle.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.world.BlockPosition; import de.bixilon.minosoft.data.world.BlockPosition;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -25,8 +25,8 @@ import java.util.UUID;
public class Turtle extends Animal { public class Turtle extends Animal {
public Turtle(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Turtle(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Home Position") @EntityMetaDataFunction(name = "Home Position")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/Wolf.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.TamableAnimal; import de.bixilon.minosoft.data.entities.entities.TamableAnimal;
import de.bixilon.minosoft.data.text.ChatColors; import de.bixilon.minosoft.data.text.ChatColors;
@ -29,8 +29,8 @@ import static de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_8_9;
public class Wolf extends TamableAnimal { public class Wolf extends TamableAnimal {
public Wolf(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Wolf(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is beging") @EntityMetaDataFunction(name = "Is beging")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/hoglin/Hoglin.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.hoglin;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.animal.Animal; import de.bixilon.minosoft.data.entities.entities.animal.Animal;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class Hoglin extends Animal { public class Hoglin extends Animal {
public Hoglin(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Hoglin(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Immune zo zombification") @EntityMetaDataFunction(name = "Immune zo zombification")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractChestedHorse.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public abstract class AbstractChestedHorse extends AbstractHorse { public abstract class AbstractChestedHorse extends AbstractHorse {
public AbstractChestedHorse(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AbstractChestedHorse(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Has chest") @EntityMetaDataFunction(name = "Has chest")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/AbstractHorse.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.animal.Animal; import de.bixilon.minosoft.data.entities.entities.animal.Animal;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -25,8 +25,8 @@ import java.util.UUID;
public abstract class AbstractHorse extends Animal { public abstract class AbstractHorse extends Animal {
public AbstractHorse(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AbstractHorse(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getAbstractHorseFlag(int bitMask) { private boolean getAbstractHorseFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Donkey.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal.horse; package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Donkey extends AbstractChestedHorse { public class Donkey extends AbstractChestedHorse {
public Donkey(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Donkey(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

4
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Horse.kt
View File

@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse
import de.bixilon.minosoft.data.entities.EntityMetaDataFields import de.bixilon.minosoft.data.entities.EntityMetaDataFields
import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.data.entities.Location import de.bixilon.minosoft.data.entities.Position
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction
import de.bixilon.minosoft.data.mappings.Item import de.bixilon.minosoft.data.mappings.Item
import de.bixilon.minosoft.data.mappings.ResourceLocation import de.bixilon.minosoft.data.mappings.ResourceLocation
@ -22,7 +22,7 @@ import de.bixilon.minosoft.protocol.network.Connection
import de.bixilon.minosoft.protocol.protocol.ProtocolVersions import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
import java.util.* import java.util.*
class Horse(connection: Connection?, entityId: Int, uuid: UUID?, location: Location?, rotation: EntityRotation?) : AbstractHorse(connection, entityId, uuid, location, rotation) { class Horse(connection: Connection?, entityId: Int, uuid: UUID?, location: Position?, rotation: EntityRotation?) : AbstractHorse(connection, entityId, uuid, location, rotation) {
private fun getAbstractHorseFlag(bitMask: Int): Boolean { private fun getAbstractHorseFlag(bitMask: Int): Boolean {
return metaData.sets.getBitMask(EntityMetaDataFields.ABSTRACT_HORSE_FLAGS, bitMask) return metaData.sets.getBitMask(EntityMetaDataFields.ABSTRACT_HORSE_FLAGS, bitMask)

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Llama.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Llama extends AbstractChestedHorse { public class Llama extends AbstractChestedHorse {
public Llama(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Llama(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Strength") @EntityMetaDataFunction(name = "Strength")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/Mule.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal.horse; package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Mule extends AbstractChestedHorse { public class Mule extends AbstractChestedHorse {
public Mule(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Mule(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/SkeletonHorse.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal.horse; package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class SkeletonHorse extends AbstractHorse { public class SkeletonHorse extends AbstractHorse {
public SkeletonHorse(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public SkeletonHorse(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/TraderLlama.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal.horse; package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class TraderLlama extends Llama { public class TraderLlama extends Llama {
public TraderLlama(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public TraderLlama(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/horse/ZombieHorse.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal.horse; package de.bixilon.minosoft.data.entities.entities.animal.horse;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class ZombieHorse extends AbstractHorse { public class ZombieHorse extends AbstractHorse {
public ZombieHorse(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ZombieHorse(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractFish.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public abstract class AbstractFish extends WaterAnimal { public abstract class AbstractFish extends WaterAnimal {
public AbstractFish(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AbstractFish(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is from bucket") @EntityMetaDataFunction(name = "Is from bucket")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/AbstractSchoolingFish.java
View File

@ -14,15 +14,15 @@
package de.bixilon.minosoft.data.entities.entities.animal.water; package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public abstract class AbstractSchoolingFish extends AbstractFish { public abstract class AbstractSchoolingFish extends AbstractFish {
public AbstractSchoolingFish(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AbstractSchoolingFish(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Cod.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal.water; package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Cod extends AbstractSchoolingFish { public class Cod extends AbstractSchoolingFish {
public Cod(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Cod(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Dolphin.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.world.BlockPosition; import de.bixilon.minosoft.data.world.BlockPosition;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -25,8 +25,8 @@ import java.util.UUID;
public class Dolphin extends WaterAnimal { public class Dolphin extends WaterAnimal {
public Dolphin(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Dolphin(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Treasure position") @EntityMetaDataFunction(name = "Treasure position")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/GlowSquid.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class GlowSquid extends Squid { public class GlowSquid extends Squid {
public GlowSquid(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public GlowSquid(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Dark ticks remaining") @EntityMetaDataFunction(name = "Dark ticks remaining")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/PufferFish.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class PufferFish extends AbstractFish { public class PufferFish extends AbstractFish {
public PufferFish(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public PufferFish(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Puff state") @EntityMetaDataFunction(name = "Puff state")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Salmon.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.animal.water; package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Salmon extends AbstractSchoolingFish { public class Salmon extends AbstractSchoolingFish {
public Salmon(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Salmon(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/Squid.java
View File

@ -14,15 +14,15 @@
package de.bixilon.minosoft.data.entities.entities.animal.water; package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Squid extends WaterAnimal { public class Squid extends WaterAnimal {
public Squid(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Squid(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/TropicalFish.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class TropicalFish extends AbstractSchoolingFish { public class TropicalFish extends AbstractSchoolingFish {
public TropicalFish(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public TropicalFish(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Variant") @EntityMetaDataFunction(name = "Variant")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/animal/water/WaterAnimal.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.animal.water; package de.bixilon.minosoft.data.entities.entities.animal.water;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.PathfinderMob; import de.bixilon.minosoft.data.entities.entities.PathfinderMob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -22,8 +22,8 @@ import java.util.UUID;
public abstract class WaterAnimal extends PathfinderMob { public abstract class WaterAnimal extends PathfinderMob {
public WaterAnimal(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public WaterAnimal(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EndCrystal.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.boss.enderdragon;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.Entity; import de.bixilon.minosoft.data.entities.entities.Entity;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.world.BlockPosition; import de.bixilon.minosoft.data.world.BlockPosition;
@ -26,8 +26,8 @@ import java.util.UUID;
public class EndCrystal extends Entity { public class EndCrystal extends Entity {
public EndCrystal(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public EndCrystal(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Beam target") @EntityMetaDataFunction(name = "Beam target")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/boss/enderdragon/EnderDragon.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.boss.enderdragon;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.Mob; import de.bixilon.minosoft.data.entities.entities.Mob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class EnderDragon extends Mob { public class EnderDragon extends Mob {
public EnderDragon(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public EnderDragon(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Phase") @EntityMetaDataFunction(name = "Phase")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/boss/wither/WitherBoss.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.boss.wither;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.monster.Monster; import de.bixilon.minosoft.data.entities.entities.monster.Monster;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class WitherBoss extends Monster { public class WitherBoss extends Monster {
public WitherBoss(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public WitherBoss(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Center head target entity id") @EntityMetaDataFunction(name = "Center head target entity id")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ArmorStand.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.decoration;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.LivingEntity; import de.bixilon.minosoft.data.entities.entities.LivingEntity;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class ArmorStand extends LivingEntity { public class ArmorStand extends LivingEntity {
public ArmorStand(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ArmorStand(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getArmorStandFlag(int bitMask) { private boolean getArmorStandFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/HangingEntity.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.decoration; package de.bixilon.minosoft.data.entities.entities.decoration;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.Entity; import de.bixilon.minosoft.data.entities.entities.Entity;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -22,8 +22,8 @@ import java.util.UUID;
public abstract class HangingEntity extends Entity { public abstract class HangingEntity extends Entity {
public HangingEntity(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public HangingEntity(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/ItemFrame.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.decoration;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.inventory.Slot; import de.bixilon.minosoft.data.inventory.Slot;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -25,8 +25,8 @@ import java.util.UUID;
public class ItemFrame extends HangingEntity { public class ItemFrame extends HangingEntity {
public ItemFrame(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ItemFrame(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Item") @EntityMetaDataFunction(name = "Item")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/LeashFenceKnotEntity.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.decoration; package de.bixilon.minosoft.data.entities.entities.decoration;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class LeashFenceKnotEntity extends HangingEntity { public class LeashFenceKnotEntity extends HangingEntity {
public LeashFenceKnotEntity(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public LeashFenceKnotEntity(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

2
src/main/java/de/bixilon/minosoft/data/entities/entities/decoration/Painting.kt
View File

@ -14,7 +14,7 @@ package de.bixilon.minosoft.data.entities.entities.decoration
import de.bixilon.minosoft.data.Directions import de.bixilon.minosoft.data.Directions
import de.bixilon.minosoft.data.entities.EntityRotation import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.data.entities.Location.Companion.fromPosition import de.bixilon.minosoft.data.entities.Position.Companion.fromPosition
import de.bixilon.minosoft.data.entities.entities.Entity import de.bixilon.minosoft.data.entities.entities.Entity
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction
import de.bixilon.minosoft.data.mappings.Motive import de.bixilon.minosoft.data.mappings.Motive

6
src/main/java/de/bixilon/minosoft/data/entities/entities/item/FallingBlock.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.item;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.Entity; import de.bixilon.minosoft.data.entities.entities.Entity;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.world.BlockPosition; import de.bixilon.minosoft.data.world.BlockPosition;
@ -26,8 +26,8 @@ import java.util.UUID;
public class FallingBlock extends Entity { public class FallingBlock extends Entity {
public FallingBlock(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public FallingBlock(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Spawn position") @EntityMetaDataFunction(name = "Spawn position")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/item/ItemEntity.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.item;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.Entity; import de.bixilon.minosoft.data.entities.entities.Entity;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.inventory.Slot; import de.bixilon.minosoft.data.inventory.Slot;
@ -26,8 +26,8 @@ import java.util.UUID;
public class ItemEntity extends Entity { public class ItemEntity extends Entity {
public ItemEntity(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ItemEntity(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Item") @EntityMetaDataFunction(name = "Item")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/item/PrimedTNT.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.item;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.Entity; import de.bixilon.minosoft.data.entities.entities.Entity;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class PrimedTNT extends Entity { public class PrimedTNT extends Entity {
public PrimedTNT(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public PrimedTNT(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Fuse time") @EntityMetaDataFunction(name = "Fuse time")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/AbstractSkeleton.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public abstract class AbstractSkeleton extends Monster { public abstract class AbstractSkeleton extends Monster {
public AbstractSkeleton(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public AbstractSkeleton(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Blaze.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Blaze extends Monster { public class Blaze extends Monster {
public Blaze(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Blaze(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getBlazeFlag(int bitMask) { private boolean getBlazeFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/CaveSpider.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class CaveSpider extends Spider { public class CaveSpider extends Spider {
public CaveSpider(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public CaveSpider(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Creeper.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Creeper extends Monster { public class Creeper extends Monster {
public Creeper(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Creeper(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "State") @EntityMetaDataFunction(name = "State")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Drowned.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Drowned extends Zombie { public class Drowned extends Zombie {
public Drowned(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Drowned(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ElderGuardian.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class ElderGuardian extends Guardian { public class ElderGuardian extends Guardian {
public ElderGuardian(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ElderGuardian(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Enderman.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.mappings.blocks.BlockState; import de.bixilon.minosoft.data.mappings.blocks.BlockState;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -27,8 +27,8 @@ import static de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_8_9;
public class Enderman extends AbstractSkeleton { public class Enderman extends AbstractSkeleton {
public Enderman(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Enderman(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Carried block") @EntityMetaDataFunction(name = "Carried block")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Endermite.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Endermite extends Monster { public class Endermite extends Monster {
public Endermite(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Endermite(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Ghast.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.FlyingMob; import de.bixilon.minosoft.data.entities.entities.FlyingMob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class Ghast extends FlyingMob { public class Ghast extends FlyingMob {
public Ghast(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Ghast(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is attacking") @EntityMetaDataFunction(name = "Is attacking")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Giant.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Giant extends Monster { public class Giant extends Monster {
public Giant(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Giant(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Guardian.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Guardian extends Monster { public class Guardian extends Monster {
public Guardian(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Guardian(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is moving") @EntityMetaDataFunction(name = "Is moving")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Husk.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Husk extends Zombie { public class Husk extends Zombie {
public Husk(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Husk(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/MagmaCube.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class MagmaCube extends Slime { public class MagmaCube extends Slime {
public MagmaCube(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public MagmaCube(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Monster.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.PathfinderMob; import de.bixilon.minosoft.data.entities.entities.PathfinderMob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -22,7 +22,7 @@ import java.util.UUID;
public abstract class Monster extends PathfinderMob { public abstract class Monster extends PathfinderMob {
public Monster(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Monster(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/PatrollingMonster.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public abstract class PatrollingMonster extends Monster { public abstract class PatrollingMonster extends Monster {
public PatrollingMonster(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public PatrollingMonster(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Phantom.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.FlyingMob; import de.bixilon.minosoft.data.entities.entities.FlyingMob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class Phantom extends FlyingMob { public class Phantom extends FlyingMob {
public Phantom(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Phantom(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Size") @EntityMetaDataFunction(name = "Size")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Shulker.java
View File

@ -16,7 +16,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.Directions; import de.bixilon.minosoft.data.Directions;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.animal.AbstractGolem; import de.bixilon.minosoft.data.entities.entities.animal.AbstractGolem;
import de.bixilon.minosoft.data.text.ChatColors; import de.bixilon.minosoft.data.text.ChatColors;
@ -29,8 +29,8 @@ import java.util.UUID;
public class Shulker extends AbstractGolem { public class Shulker extends AbstractGolem {
public Shulker(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Shulker(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Attachment face") @EntityMetaDataFunction(name = "Attachment face")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Silverfish.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Silverfish extends Monster { public class Silverfish extends Monster {
public Silverfish(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Silverfish(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Skeleton.java
View File

@ -15,15 +15,15 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Skeleton extends AbstractSkeleton { public class Skeleton extends AbstractSkeleton {
public Skeleton(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Skeleton(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
public boolean isFreezeConverting() { public boolean isFreezeConverting() {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Slime.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.data.entities.entities.Mob; import de.bixilon.minosoft.data.entities.entities.Mob;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -25,8 +25,8 @@ import java.util.UUID;
public class Slime extends Mob { public class Slime extends Mob {
public Slime(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Slime(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@IntRange(from = 0) @IntRange(from = 0)

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Spider.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Spider extends Monster { public class Spider extends Monster {
public Spider(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Spider(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getSpiderFlag(int bitMask) { private boolean getSpiderFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Stray.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class Stray extends AbstractSkeleton { public class Stray extends AbstractSkeleton {
public Stray(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Stray(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Vex.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Vex extends Monster { public class Vex extends Monster {
public Vex(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Vex(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
private boolean getVexFlag(int bitMask) { private boolean getVexFlag(int bitMask) {

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/WitherSkeleton.java
View File

@ -14,14 +14,14 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
public class WitherSkeleton extends AbstractSkeleton { public class WitherSkeleton extends AbstractSkeleton {
public WitherSkeleton(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public WitherSkeleton(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zoglin.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Zoglin extends Monster { public class Zoglin extends Monster {
public Zoglin(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Zoglin(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is baby") @EntityMetaDataFunction(name = "Is baby")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/Zombie.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -23,8 +23,8 @@ import java.util.UUID;
public class Zombie extends Monster { public class Zombie extends Monster {
public Zombie(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public Zombie(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is baby") @EntityMetaDataFunction(name = "Is baby")

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombiePigman.java
View File

@ -14,7 +14,7 @@
package de.bixilon.minosoft.data.entities.entities.monster; package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
import java.util.UUID; import java.util.UUID;
@ -25,8 +25,8 @@ import java.util.UUID;
@Deprecated @Deprecated
public class ZombiePigman extends ZombifiedPiglin { public class ZombiePigman extends ZombifiedPiglin {
public ZombiePigman(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ZombiePigman(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
} }

6
src/main/java/de/bixilon/minosoft/data/entities/entities/monster/ZombieVillager.java
View File

@ -15,7 +15,7 @@ package de.bixilon.minosoft.data.entities.entities.monster;
import de.bixilon.minosoft.data.entities.EntityMetaDataFields; import de.bixilon.minosoft.data.entities.EntityMetaDataFields;
import de.bixilon.minosoft.data.entities.EntityRotation; import de.bixilon.minosoft.data.entities.EntityRotation;
import de.bixilon.minosoft.data.entities.Location; import de.bixilon.minosoft.data.entities.Position;
import de.bixilon.minosoft.data.entities.VillagerData; import de.bixilon.minosoft.data.entities.VillagerData;
import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction; import de.bixilon.minosoft.data.entities.entities.EntityMetaDataFunction;
import de.bixilon.minosoft.protocol.network.Connection; import de.bixilon.minosoft.protocol.network.Connection;
@ -24,8 +24,8 @@ import java.util.UUID;
public class ZombieVillager extends Zombie { public class ZombieVillager extends Zombie {
public ZombieVillager(Connection connection, int entityId, UUID uuid, Location location, EntityRotation rotation) { public ZombieVillager(Connection connection, int entityId, UUID uuid, Position position, EntityRotation rotation) {
super(connection, entityId, uuid, location, rotation); super(connection, entityId, uuid, position, rotation);
} }
@EntityMetaDataFunction(name = "Is converting") @EntityMetaDataFunction(name = "Is converting")

Some files were not shown because too many files have changed in this diff Show More