Minecraft/mc-core
Archived
0
Fork 0
Code Activity

Proper Look structure refactoring

Browse Source
This commit is contained in:
Daniil
2018-08-06 00:23:28 +07:00
parent 993d9a8293
commit 0ca3e4db6f
11 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/mc/core/WarpPosition.java
View File

@@ -36,7 +36,7 @@ public class WarpPosition extends Location implements Serializable, ILook {
super(location.getX(), location.getY(), location.getZ()); super(location.getX(), location.getY(), location.getZ());
} }
public WarpPosition(Location location, Look look) { public WarpPosition(Location location, ILook look) {
super(location.getX(), location.getY(), location.getZ()); super(location.getX(), location.getY(), location.getZ());
this.look = look; this.look = look;
} }
@@ -46,7 +46,7 @@ public class WarpPosition extends Location implements Serializable, ILook {
} }
@Override @Override
public void set(Look look) { public void set(ILook look) {
this.look = look; this.look = look;
} }

4
core/src/main/java/mc/core/embedded/FakePlayerManager.java
View File

@@ -8,7 +8,7 @@ import mc.core.Location;
import mc.core.chat.MessageType; import mc.core.chat.MessageType;
import mc.core.network.NetChannel; import mc.core.network.NetChannel;
import mc.core.network.SCPacket; import mc.core.network.SCPacket;
import mc.core.player.Look; import mc.core.player.ILook;
import mc.core.player.Player; import mc.core.player.Player;
import mc.core.player.PlayerManager; import mc.core.player.PlayerManager;
import mc.core.text.Text; import mc.core.text.Text;
@@ -52,7 +52,7 @@ public class FakePlayerManager implements PlayerManager {
private static final NetChannel FAKE_NET_CHANNEL = new FakeNetChannet(); private static final NetChannel FAKE_NET_CHANNEL = new FakeNetChannet();
@Override @Override
public Player createPlayer(String name, Location defaultLocation, Look defaultLook) { public Player createPlayer(String name, Location defaultLocation, ILook defaultLook) {
return null; return null;
} }

4
core/src/main/java/mc/core/events/PlayerLookEvent.java
View File

@@ -7,7 +7,7 @@ package mc.core.events;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.Setter; import lombok.Setter;
import mc.core.player.Look; import mc.core.player.ILook;
import mc.core.player.Player; import mc.core.player.Player;
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -15,5 +15,5 @@ import mc.core.player.Player;
@Setter @Setter
public class PlayerLookEvent extends EventBase { public class PlayerLookEvent extends EventBase {
private final Player player; private final Player player;
private Look newLook; private ILook newLook;
} }

6
core/src/main/java/mc/core/player/ILook.java
View File

@@ -1,9 +1,7 @@
package mc.core.player; package mc.core.player;
import java.io.Serializable; public interface ILook {
void set(ILook look);
public interface ILook extends Serializable {
void set(Look look);
float getYaw(); float getYaw();

2
core/src/main/java/mc/core/player/InMemoryPlayerManager.java
View File

@@ -31,7 +31,7 @@ public class InMemoryPlayerManager implements PlayerManager, Runnable {
} }
@Override @Override
public Player createPlayer(String name, Location defaultLocation, Look defaultLook) { public Player createPlayer(String name, Location defaultLocation, ILook defaultLook) {
SimplePlayer player = new SimplePlayer(); SimplePlayer player = new SimplePlayer();
player.setId(rand.nextInt(10000)); player.setId(rand.nextInt(10000));
player.setUUID(UUID.nameUUIDFromBytes(name.getBytes())); player.setUUID(UUID.nameUUIDFromBytes(name.getBytes()));

6
core/src/main/java/mc/core/player/Look.java
View File

@@ -13,8 +13,8 @@ public class Look implements ILook {
private float yaw, pitch; private float yaw, pitch;
@Override @Override
public void set(Look look) { public void set(ILook look) {
this.yaw = look.yaw; this.yaw = look.getYaw();
this.pitch = look.pitch; this.pitch = look.getPitch();
} }
} }

2
core/src/main/java/mc/core/player/Player.java
View File

@@ -20,7 +20,7 @@ public interface Player {
Location getLocation(); Location getLocation();
Look getLook(); ILook getLook();
boolean isFlying(); boolean isFlying();
void setFlying(boolean value); void setFlying(boolean value);

2
core/src/main/java/mc/core/player/PlayerManager.java
View File

@@ -11,7 +11,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
public interface PlayerManager { public interface PlayerManager {
Player createPlayer(String name, Location defaultLocation, Look defaultLook); Player createPlayer(String name, Location defaultLocation, ILook defaultLook);
void joinServer(Player player); void joinServer(Player player);
void leftServer(Player player); void leftServer(Player player);
Optional<Player> getPlayer(String name); Optional<Player> getPlayer(String name);

4
core/src/main/java/mc/core/player/SimplePlayer.java
View File

@@ -18,7 +18,7 @@ public class SimplePlayer implements Player {
private boolean online = false; private boolean online = false;
private NetChannel channel; private NetChannel channel;
private Location location = new Location(0, 0, 0); private Location location = new Location(0, 0, 0);
private Look look = new Look(0, 0); private ILook look = new Look(0, 0);
private boolean flying = false; private boolean flying = false;
private PlayerSettings settings; private PlayerSettings settings;
@@ -26,7 +26,7 @@ public class SimplePlayer implements Player {
this.location.set(location); this.location.set(location);
} }
public void setLook(Look look) { public void setLook(ILook look) {
this.look.set(look); this.look.set(look);
} }

3
proto_1.12.2/src/main/java/mc/core/network/proto_1_12_2/packets/PlayerPositionAndLookPacket.java
View File

@@ -10,6 +10,7 @@ import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import mc.core.Location; import mc.core.Location;
import mc.core.network.*; import mc.core.network.*;
import mc.core.player.ILook;
import mc.core.player.Look; import mc.core.player.Look;
@NoArgsConstructor @NoArgsConstructor
@@ -18,7 +19,7 @@ import mc.core.player.Look;
@ToString @ToString
public class PlayerPositionAndLookPacket implements SCPacket, CSPacket { public class PlayerPositionAndLookPacket implements SCPacket, CSPacket {
private Location location; private Location location;
private Look look; private ILook look;
private int teleportId; private int teleportId;
private boolean onGround = false; private boolean onGround = false;

7
proto_1.12.2_netty/src/main/java/mc/core/network/proto_1_12_2/netty/handlers/LoginHandler.java
View File

@@ -10,7 +10,6 @@ import mc.core.network.proto_1_12_2.State;
import mc.core.network.proto_1_12_2.TeleportManager; import mc.core.network.proto_1_12_2.TeleportManager;
import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetChannel; import mc.core.network.proto_1_12_2.netty.wrappers.WrapperNetChannel;
import mc.core.network.proto_1_12_2.packets.*; import mc.core.network.proto_1_12_2.packets.*;
import mc.core.player.Look;
import mc.core.player.Player; import mc.core.player.Player;
import mc.core.player.PlayerManager; import mc.core.player.PlayerManager;
import mc.core.player.PlayerMode; import mc.core.player.PlayerMode;
@@ -48,8 +47,8 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
Player player = playerManager.getPlayer(packet.getPlayerName()) Player player = playerManager.getPlayer(packet.getPlayerName())
.orElseGet(() -> playerManager.createPlayer( .orElseGet(() -> playerManager.createPlayer(
packet.getPlayerName(), packet.getPlayerName(),
world.getSpawn().getLocation(), world.getSpawn(),
world.getSpawn().getLook())); world.getSpawn()));
channel.writeAndFlush(new LoginSuccessPacket( channel.writeAndFlush(new LoginSuccessPacket(
player.getUUID(), player.getUUID(),
@@ -68,7 +67,7 @@ public class LoginHandler extends AbstractStateHandler implements LoginStateHand
// Spawn Position // Spawn Position
SpawnPositionPacket pkt2 = new SpawnPositionPacket(); SpawnPositionPacket pkt2 = new SpawnPositionPacket();
pkt2.setLocation(world.getSpawn().getLocation()); pkt2.setLocation(world.getSpawn());
channel.write(pkt2); channel.write(pkt2);
// Player Abilities // Player Abilities