diff --git a/bukkit-legacy/pom.xml b/bukkit-legacy/pom.xml
new file mode 100644
index 000000000..1a3bcd718
--- /dev/null
+++ b/bukkit-legacy/pom.xml
@@ -0,0 +1,63 @@
+
+
+
+ viaversion-parent
+ us.myles
+ 3.0.0-SNAPSHOT
+
+ 4.0.0
+
+ viaversion-bukkit-legacy
+
+
+ 1.8.8-R0.1-SNAPSHOT
+
+
+
+
+
+ .
+ true
+ src/main/resources/
+
+ *
+
+
+
+
+
+
+
+
+ us.myles
+ viaversion-common
+ ${project.parent.version}
+ provided
+
+
+
+
+ org.bukkit
+ bukkit
+ ${bukkitVersion}
+ provided
+ true
+
+
+ junit
+ junit
+
+
+ gson
+ com.google.code.gson
+
+
+ persistence-api
+ javax.persistence
+
+
+
+
+
\ No newline at end of file
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java
similarity index 78%
rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java
rename to bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java
index a94bca5d3..33d245c87 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java
+++ b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/ViaBukkitListener.java
@@ -1,21 +1,16 @@
package us.myles.ViaVersion.bukkit.listeners;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NonNull;
import org.bukkit.entity.Player;
import org.bukkit.event.Listener;
import org.bukkit.plugin.Plugin;
-import us.myles.ViaVersion.ViaVersionPlugin;
import us.myles.ViaVersion.api.ViaListener;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.protocol.Protocol;
-@Getter(AccessLevel.PROTECTED)
public class ViaBukkitListener extends ViaListener implements Listener {
private final Plugin plugin;
- public ViaBukkitListener(ViaVersionPlugin plugin, Class extends Protocol> requiredPipeline) {
+ public ViaBukkitListener(Plugin plugin, Class extends Protocol> requiredPipeline) {
super(requiredPipeline);
this.plugin = plugin;
}
@@ -26,7 +21,7 @@ public class ViaBukkitListener extends ViaListener implements Listener {
* @param player Player object
* @return The UserConnection
*/
- protected UserConnection getUserConnection(@NonNull Player player) {
+ protected UserConnection getUserConnection(Player player) {
return getUserConnection(player.getUniqueId());
}
@@ -50,4 +45,8 @@ public class ViaBukkitListener extends ViaListener implements Listener {
plugin.getServer().getPluginManager().registerEvents(this, plugin);
setRegistered(true);
}
+
+ public Plugin getPlugin() {
+ return plugin;
+ }
}
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
similarity index 90%
rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
rename to bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
index c40fc9b83..19aecfd04 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
+++ b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/ArmorListener.java
@@ -14,7 +14,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.inventory.CraftingInventory;
import org.bukkit.inventory.ItemStack;
-import us.myles.ViaVersion.ViaVersionPlugin;
+import org.bukkit.plugin.Plugin;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.type.Type;
@@ -28,7 +28,7 @@ public class ArmorListener extends ViaBukkitListener {
private static final UUID ARMOR_ATTRIBUTE = UUID.fromString("2AD3F246-FEE1-4E67-B886-69FD380BB150");
- public ArmorListener(ViaVersionPlugin plugin) {
+ public ArmorListener(Plugin plugin) {
super(plugin, Protocol1_9To1_8.class);
}
@@ -36,7 +36,6 @@ public class ArmorListener extends ViaBukkitListener {
// Ensure that the player is on our pipe
if (!isOnPipe(player)) return;
-
int armor = 0;
for (ItemStack stack : player.getInventory().getArmorContents()) {
armor += ArmorType.findById(stack.getTypeId()).getArmorPoints();
@@ -82,12 +81,7 @@ public class ArmorListener extends ViaBukkitListener {
if (e.getAction() == Action.RIGHT_CLICK_AIR || e.getAction() == Action.RIGHT_CLICK_BLOCK) {
final Player player = e.getPlayer();
// Due to odd bugs it's 3 ticks later
- Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() {
- @Override
- public void run() {
- sendArmorUpdate(player);
- }
- }, 3L);
+ Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), () -> sendArmorUpdate(player), 3L);
}
}
}
@@ -114,11 +108,6 @@ public class ArmorListener extends ViaBukkitListener {
public void sendDelayedArmorUpdate(final Player player) {
if (!isOnPipe(player)) return; // Don't start a task if the player is not on the pipe
- Via.getPlatform().runSync(new Runnable() {
- @Override
- public void run() {
- sendArmorUpdate(player);
- }
- });
+ Via.getPlatform().runSync(() -> sendArmorUpdate(player));
}
}
\ No newline at end of file
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java
similarity index 91%
rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java
rename to bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java
index 613ac2034..51212c4ab 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java
+++ b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/BlockListener.java
@@ -4,7 +4,7 @@ import org.bukkit.block.Block;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockPlaceEvent;
-import us.myles.ViaVersion.ViaVersionPlugin;
+import org.bukkit.plugin.Plugin;
import us.myles.ViaVersion.api.minecraft.Position;
import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener;
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
@@ -12,7 +12,7 @@ import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker1_9;
public class BlockListener extends ViaBukkitListener {
- public BlockListener(ViaVersionPlugin plugin) {
+ public BlockListener(Plugin plugin) {
super(plugin, Protocol1_9To1_8.class);
}
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
similarity index 95%
rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
rename to bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
index 9182406a7..75df92843 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
+++ b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/DeathListener.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.PlayerDeathEvent;
-import us.myles.ViaVersion.ViaVersionPlugin;
+import org.bukkit.plugin.Plugin;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.data.UserConnection;
@@ -14,7 +14,8 @@ import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener;
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
public class DeathListener extends ViaBukkitListener {
- public DeathListener(ViaVersionPlugin plugin) {
+
+ public DeathListener(Plugin plugin) {
super(plugin, Protocol1_9To1_8.class);
}
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
similarity index 99%
rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
rename to bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
index 0acf86965..11603c003 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
+++ b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/HandItemCache.java
@@ -13,6 +13,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
public class HandItemCache extends BukkitRunnable {
+
private final Map handCache = new ConcurrentHashMap<>();
@Override
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java
similarity index 96%
rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java
rename to bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java
index e4a3eb9bc..7281ed60f 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java
+++ b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java
@@ -6,13 +6,13 @@ import org.bukkit.block.BlockFace;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockPlaceEvent;
-import us.myles.ViaVersion.ViaVersionPlugin;
+import org.bukkit.plugin.Plugin;
import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener;
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
public class PaperPatch extends ViaBukkitListener {
- public PaperPatch(ViaVersionPlugin plugin) {
+ public PaperPatch(Plugin plugin) {
super(plugin, Protocol1_9To1_8.class);
}
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitBlockConnectionProvider.java b/bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitBlockConnectionProvider.java
similarity index 100%
rename from bukkit/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitBlockConnectionProvider.java
rename to bukkit-legacy/src/main/java/us/myles/ViaVersion/bukkit/providers/BukkitBlockConnectionProvider.java
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index ddecc1bc9..d20aad9cb 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -13,7 +13,7 @@
- 1.8.8-R0.1-SNAPSHOT
+ 1.15.2-R0.1-SNAPSHOT
@@ -60,5 +60,13 @@
+
+
+
+ us.myles
+ viaversion-bukkit-legacy
+ ${project.parent.version}
+ compile
+
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/boss/ViaBossBar.java b/bukkit/src/main/java/us/myles/ViaVersion/boss/ViaBossBar.java
index 7083ac7d8..5314b93a6 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/boss/ViaBossBar.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/boss/ViaBossBar.java
@@ -1,12 +1,10 @@
package us.myles.ViaVersion.boss;
-import lombok.Getter;
import org.bukkit.entity.Player;
import us.myles.ViaVersion.api.boss.BossBar;
import us.myles.ViaVersion.api.boss.BossColor;
import us.myles.ViaVersion.api.boss.BossStyle;
-@Getter
public class ViaBossBar extends CommonBoss {
public ViaBossBar(String title, float health, BossColor color, BossStyle style) {
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandSender.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandSender.java
index 9e08186ca..6eca4a5cf 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandSender.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/commands/BukkitCommandSender.java
@@ -1,16 +1,18 @@
package us.myles.ViaVersion.bukkit.commands;
-import lombok.AllArgsConstructor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import us.myles.ViaVersion.api.command.ViaCommandSender;
import java.util.UUID;
-@AllArgsConstructor
public class BukkitCommandSender implements ViaCommandSender {
private final CommandSender sender;
+ public BukkitCommandSender(CommandSender sender) {
+ this.sender = sender;
+ }
+
@Override
public boolean hasPermission(String permission) {
return sender.hasPermission(permission);
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
new file mode 100644
index 000000000..f2171ef35
--- /dev/null
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_15to1_14_4/EntityToggleGlideListener.java
@@ -0,0 +1,68 @@
+package us.myles.ViaVersion.bukkit.listeners.protocol1_15to1_14_4;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityToggleGlideEvent;
+import org.bukkit.potion.PotionEffectType;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
+import us.myles.ViaVersion.api.minecraft.metadata.types.MetaType1_14;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.api.type.types.version.Types1_14;
+import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener;
+import us.myles.ViaVersion.protocols.protocol1_15to1_14_4.Protocol1_15To1_14_4;
+
+import java.util.Arrays;
+
+public class EntityToggleGlideListener extends ViaBukkitListener {
+
+ public EntityToggleGlideListener(ViaVersionPlugin plugin) {
+ super(plugin, Protocol1_15To1_14_4.class);
+ }
+
+ @EventHandler(priority = EventPriority.MONITOR)
+ public void entityToggleGlide(EntityToggleGlideEvent event) {
+ if (!(event.getEntity() instanceof Player)) return;
+
+ Player player = (Player) event.getEntity();
+ if (!isOnPipe(player)) return;
+
+ // Cancelling can only be done by updating the player's metadata
+ if (event.isGliding() && event.isCancelled()) {
+ PacketWrapper packet = new PacketWrapper(0x44, null, getUserConnection(player));
+ try {
+ packet.write(Type.VAR_INT, player.getEntityId());
+
+ byte bitmask = 0;
+ // Collect other metadata for the mitmask
+ if (player.getFireTicks() > 0) {
+ bitmask |= 0x01;
+ }
+ if (player.isSneaking()) {
+ bitmask |= 0x02;
+ }
+ // 0x04 is unused
+ if (player.isSprinting()) {
+ bitmask |= 0x08;
+ }
+ if (player.isSwimming()) {
+ bitmask |= 0x10;
+ }
+ if (player.hasPotionEffect(PotionEffectType.INVISIBILITY)) {
+ bitmask |= 0x20;
+ }
+ if (player.isGlowing()) {
+ bitmask |= 0x40;
+ }
+
+ // leave 0x80 as 0 to stop gliding
+ packet.write(Types1_14.METADATA_LIST, Arrays.asList(new Metadata(0, MetaType1_14.Byte, bitmask)));
+ packet.send(Protocol1_15To1_14_4.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitTaskId.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitTaskId.java
index 462aa0848..e2cd22fb5 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitTaskId.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitTaskId.java
@@ -1,11 +1,16 @@
package us.myles.ViaVersion.bukkit.platform;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
import us.myles.ViaVersion.api.platform.TaskId;
-@Getter
-@AllArgsConstructor
public class BukkitTaskId implements TaskId {
private final Integer object;
+
+ public BukkitTaskId(Integer object) {
+ this.object = object;
+ }
+
+ @Override
+ public Integer getObject() {
+ return object;
+ }
}
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaAPI.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaAPI.java
index a41c414ef..d5b623b1b 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaAPI.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaAPI.java
@@ -1,7 +1,6 @@
package us.myles.ViaVersion.bukkit.platform;
import io.netty.buffer.ByteBuf;
-import lombok.NonNull;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import us.myles.ViaVersion.ViaVersionPlugin;
@@ -28,12 +27,12 @@ public class BukkitViaAPI implements ViaAPI {
}
@Override
- public int getPlayerVersion(@NonNull Player player) {
+ public int getPlayerVersion(Player player) {
return getPlayerVersion(player.getUniqueId());
}
@Override
- public int getPlayerVersion(@NonNull UUID uuid) {
+ public int getPlayerVersion(UUID uuid) {
if (!isInjected(uuid))
return getExternalVersion(Bukkit.getPlayer(uuid));
return Via.getManager().getConnection(uuid).get(ProtocolInfo.class).getProtocolVersion();
diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java
index 7672cfadc..52cb7a638 100644
--- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java
+++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java
@@ -17,7 +17,12 @@ import us.myles.ViaVersion.api.protocol.ProtocolVersion;
import us.myles.ViaVersion.bukkit.classgenerator.ClassGenerator;
import us.myles.ViaVersion.bukkit.listeners.UpdateListener;
import us.myles.ViaVersion.bukkit.listeners.multiversion.PlayerSneakListener;
-import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.*;
+import us.myles.ViaVersion.bukkit.listeners.protocol1_15to1_14_4.EntityToggleGlideListener;
+import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.ArmorListener;
+import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.BlockListener;
+import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.DeathListener;
+import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.HandItemCache;
+import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.PaperPatch;
import us.myles.ViaVersion.bukkit.providers.BukkitBlockConnectionProvider;
import us.myles.ViaVersion.bukkit.providers.BukkitInventoryQuickMoveProvider;
import us.myles.ViaVersion.bukkit.providers.BukkitViaBulkChunkTranslator;
@@ -99,6 +104,14 @@ public class BukkitViaLoader implements ViaPlatformLoader {
}
}
+ if (ProtocolRegistry.SERVER_PROTOCOL < ProtocolVersion.v1_15.getId()) {
+ try {
+ Class.forName("org.bukkit.event.entity.EntityToggleGlideEvent");
+ storeListener(new EntityToggleGlideListener(plugin)).register();
+ } catch (ClassNotFoundException ignored) {
+ }
+ }
+
if ((Bukkit.getVersion().toLowerCase(Locale.ROOT).contains("paper")
|| Bukkit.getVersion().toLowerCase(Locale.ROOT).contains("taco")
|| Bukkit.getVersion().toLowerCase(Locale.ROOT).contains("torch"))
diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandSender.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandSender.java
index 5b9e43382..c6c549af2 100644
--- a/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandSender.java
+++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/commands/BungeeCommandSender.java
@@ -1,15 +1,17 @@
package us.myles.ViaVersion.bungee.commands;
-import lombok.AllArgsConstructor;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import us.myles.ViaVersion.api.command.ViaCommandSender;
import java.util.UUID;
-@AllArgsConstructor
public class BungeeCommandSender implements ViaCommandSender {
- private CommandSender sender;
+ private final CommandSender sender;
+
+ public BungeeCommandSender(CommandSender sender) {
+ this.sender = sender;
+ }
@Override
public boolean hasPermission(String permission) {
diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeChannelInitializer.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeChannelInitializer.java
index 3902ddf56..ac7cba74c 100644
--- a/bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeChannelInitializer.java
+++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeChannelInitializer.java
@@ -2,15 +2,12 @@ package us.myles.ViaVersion.bungee.handlers;
import io.netty.channel.Channel;
import io.netty.channel.ChannelInitializer;
-import io.netty.channel.socket.SocketChannel;
-import lombok.Getter;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
import java.lang.reflect.Method;
public class BungeeChannelInitializer extends ChannelInitializer {
- @Getter
private final ChannelInitializer original;
private Method method;
@@ -40,6 +37,9 @@ public class BungeeChannelInitializer extends ChannelInitializer {
socketChannel.pipeline().addBefore("packet-encoder", "via-encoder", encoder);
socketChannel.pipeline().addBefore("packet-decoder", "via-decoder", decoder);
+ }
+ public ChannelInitializer getOriginal() {
+ return original;
}
}
diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeTaskId.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeTaskId.java
index cde0c6098..96b9a8045 100644
--- a/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeTaskId.java
+++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeTaskId.java
@@ -1,11 +1,16 @@
package us.myles.ViaVersion.bungee.platform;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
import us.myles.ViaVersion.api.platform.TaskId;
-@Getter
-@AllArgsConstructor
public class BungeeTaskId implements TaskId {
- private Integer object;
+ private final Integer object;
+
+ public BungeeTaskId(Integer object) {
+ this.object = object;
+ }
+
+ @Override
+ public Integer getObject() {
+ return object;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java b/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java
index c1d8dda58..dab0fc13c 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java
@@ -17,8 +17,6 @@ import us.myles.ViaVersion.util.PipelineUtil;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
@Data
public class UserConnection {
@@ -156,12 +154,12 @@ public class UserConnection {
if (conf.getMaxWarnings() > 0 && conf.getTrackingPeriod() > 0) {
if (secondsObserved > conf.getTrackingPeriod()) {
// Reset
- setWarnings(0);
- setSecondsObserved(1);
+ warnings = 0;
+ secondsObserved = 1;
} else {
- setSecondsObserved(secondsObserved + 1);
+ secondsObserved++;
if (packetsPerSecond >= conf.getWarningPPS()) {
- setWarnings(warnings + 1);
+ warnings++;
}
if (warnings >= conf.getMaxWarnings()) {
diff --git a/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java b/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
index 93e77bfe0..0ea2c766b 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/minecraft/item/Item.java
@@ -2,11 +2,7 @@ package us.myles.ViaVersion.api.minecraft.item;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.google.gson.annotations.SerializedName;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-@NoArgsConstructor
-@AllArgsConstructor
public class Item {
@SerializedName(value = "identifier", alternate = "id")
private int identifier;
@@ -14,6 +10,16 @@ public class Item {
private short data;
private CompoundTag tag;
+ public Item() {
+ }
+
+ public Item(int identifier, byte amount, short data, CompoundTag tag) {
+ this.identifier = identifier;
+ this.amount = amount;
+ this.data = data;
+ this.tag = tag;
+ }
+
public Item(Item toCopy) {
this(toCopy.getIdentifier(), toCopy.getAmount(), toCopy.getData(), toCopy.getTag());
}
diff --git a/common/src/main/java/us/myles/ViaVersion/boss/CommonBoss.java b/common/src/main/java/us/myles/ViaVersion/boss/CommonBoss.java
index 9de550bc4..afc97ddec 100644
--- a/common/src/main/java/us/myles/ViaVersion/boss/CommonBoss.java
+++ b/common/src/main/java/us/myles/ViaVersion/boss/CommonBoss.java
@@ -1,8 +1,6 @@
package us.myles.ViaVersion.boss;
import com.google.common.base.Preconditions;
-import lombok.Getter;
-import lombok.NonNull;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.boss.BossBar;
@@ -14,9 +12,12 @@ import us.myles.ViaVersion.api.protocol.ProtocolVersion;
import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
-@Getter
public abstract class CommonBoss extends BossBar {
private final UUID uuid;
private String title;
@@ -42,7 +43,8 @@ public abstract class CommonBoss extends BossBar {
}
@Override
- public BossBar setTitle(@NonNull String title) {
+ public BossBar setTitle(String title) {
+ Preconditions.checkNotNull(title);
this.title = title;
sendPacket(CommonBoss.UpdateAction.UPDATE_TITLE);
return this;
@@ -62,14 +64,16 @@ public abstract class CommonBoss extends BossBar {
}
@Override
- public BossBar setColor(@NonNull BossColor color) {
+ public BossBar setColor(BossColor color) {
+ Preconditions.checkNotNull(color);
this.color = color;
sendPacket(CommonBoss.UpdateAction.UPDATE_STYLE);
return this;
}
@Override
- public BossBar setStyle(@NonNull BossStyle style) {
+ public BossBar setStyle(BossStyle style) {
+ Preconditions.checkNotNull(style);
this.style = style;
sendPacket(CommonBoss.UpdateAction.UPDATE_STYLE);
return this;
@@ -98,7 +102,8 @@ public abstract class CommonBoss extends BossBar {
}
@Override
- public BossBar addFlag(@NonNull BossFlag flag) {
+ public BossBar addFlag(BossFlag flag) {
+ Preconditions.checkNotNull(flag);
if (!hasFlag(flag))
flags.add(flag);
sendPacket(CommonBoss.UpdateAction.UPDATE_FLAGS);
@@ -106,7 +111,8 @@ public abstract class CommonBoss extends BossBar {
}
@Override
- public BossBar removeFlag(@NonNull BossFlag flag) {
+ public BossBar removeFlag(BossFlag flag) {
+ Preconditions.checkNotNull(flag);
if (hasFlag(flag))
flags.remove(flag);
sendPacket(CommonBoss.UpdateAction.UPDATE_FLAGS);
@@ -114,7 +120,8 @@ public abstract class CommonBoss extends BossBar {
}
@Override
- public boolean hasFlag(@NonNull BossFlag flag) {
+ public boolean hasFlag(BossFlag flag) {
+ Preconditions.checkNotNull(flag);
return flags.contains(flag);
}
@@ -145,6 +152,29 @@ public abstract class CommonBoss extends BossBar {
return uuid;
}
+ public UUID getUuid() {
+ return uuid;
+ }
+
+ @Override
+ public String getTitle() {
+ return title;
+ }
+
+ @Override
+ public float getHealth() {
+ return health;
+ }
+
+ @Override
+ public BossStyle getStyle() {
+ return style;
+ }
+
+ public Set getFlags() {
+ return flags;
+ }
+
private void setVisible(boolean value) {
if (visible != value) {
visible = value;
diff --git a/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java b/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java
index 9935fc48c..fa35133fa 100644
--- a/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java
+++ b/common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java
@@ -1,7 +1,6 @@
package us.myles.ViaVersion.commands;
import com.google.common.base.Preconditions;
-import lombok.NonNull;
import net.md_5.bungee.api.ChatColor;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.command.ViaCommandSender;
@@ -24,7 +23,7 @@ public abstract class ViaCommandHandler implements ViaVersionCommand {
}
@Override
- public void registerSubCommand(@NonNull ViaSubCommand command) throws Exception {
+ public void registerSubCommand(ViaSubCommand command) throws Exception {
Preconditions.checkArgument(command.name().matches("^[a-z0-9_-]{3,15}$"), command.name() + " is not a valid sub-command name.");
if (hasSubCommand(command.name()))
throw new Exception("ViaSubCommand " + command.name() + " does already exists!"); //Maybe another exception later.
@@ -163,7 +162,7 @@ public abstract class ViaCommandHandler implements ViaVersionCommand {
* @param message The message
* @param args The objects to replace
*/
- public static void sendMessage(@NonNull ViaCommandSender sender, String message, Object... args) {
+ public static void sendMessage(ViaCommandSender sender, String message, Object... args) {
sender.sendMessage(color(args == null ? message : String.format(message, args)));
}
}
diff --git a/common/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java b/common/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java
index ec15a1e40..e1db18b34 100644
--- a/common/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java
+++ b/common/src/main/java/us/myles/ViaVersion/dump/DumpTemplate.java
@@ -1,16 +1,35 @@
package us.myles.ViaVersion.dump;
import com.google.gson.JsonObject;
-import lombok.AllArgsConstructor;
-import lombok.Data;
import java.util.Map;
-@Data
-@AllArgsConstructor
public class DumpTemplate {
- private VersionInfo versionInfo;
- private Map configuration;
- private JsonObject platformDump;
- private JsonObject injectionDump;
+ private final VersionInfo versionInfo;
+ private final Map configuration;
+ private final JsonObject platformDump;
+ private final JsonObject injectionDump;
+
+ public DumpTemplate(VersionInfo versionInfo, Map configuration, JsonObject platformDump, JsonObject injectionDump) {
+ this.versionInfo = versionInfo;
+ this.configuration = configuration;
+ this.platformDump = platformDump;
+ this.injectionDump = injectionDump;
+ }
+
+ public VersionInfo getVersionInfo() {
+ return versionInfo;
+ }
+
+ public Map getConfiguration() {
+ return configuration;
+ }
+
+ public JsonObject getPlatformDump() {
+ return platformDump;
+ }
+
+ public JsonObject getInjectionDump() {
+ return injectionDump;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/dump/PluginInfo.java b/common/src/main/java/us/myles/ViaVersion/dump/PluginInfo.java
index cbe273a7c..86078d024 100644
--- a/common/src/main/java/us/myles/ViaVersion/dump/PluginInfo.java
+++ b/common/src/main/java/us/myles/ViaVersion/dump/PluginInfo.java
@@ -1,16 +1,39 @@
package us.myles.ViaVersion.dump;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
import java.util.List;
-@Data
-@AllArgsConstructor
public class PluginInfo {
- private boolean enabled;
- private String name;
- private String version;
- private String main;
- private List authors;
+ private final boolean enabled;
+ private final String name;
+ private final String version;
+ private final String main;
+ private final List authors;
+
+ public PluginInfo(boolean enabled, String name, String version, String main, List authors) {
+ this.enabled = enabled;
+ this.name = name;
+ this.version = version;
+ this.main = main;
+ this.authors = authors;
+ }
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public String getMain() {
+ return main;
+ }
+
+ public List getAuthors() {
+ return authors;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/dump/VersionInfo.java b/common/src/main/java/us/myles/ViaVersion/dump/VersionInfo.java
index 3c7f81110..0ab5711a4 100644
--- a/common/src/main/java/us/myles/ViaVersion/dump/VersionInfo.java
+++ b/common/src/main/java/us/myles/ViaVersion/dump/VersionInfo.java
@@ -1,19 +1,52 @@
package us.myles.ViaVersion.dump;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
import java.util.Set;
-@Data
-@AllArgsConstructor
public class VersionInfo {
- private String javaVersion;
- private String operatingSystem;
- private int serverProtocol;
- private Set enabledProtocols;
- private String platformName;
- private String platformVersion;
- private String pluginVersion;
+ private final String javaVersion;
+ private final String operatingSystem;
+ private final int serverProtocol;
+ private final Set enabledProtocols;
+ private final String platformName;
+ private final String platformVersion;
+ private final String pluginVersion;
+
+ public VersionInfo(String javaVersion, String operatingSystem, int serverProtocol, Set enabledProtocols, String platformName, String platformVersion, String pluginVersion) {
+ this.javaVersion = javaVersion;
+ this.operatingSystem = operatingSystem;
+ this.serverProtocol = serverProtocol;
+ this.enabledProtocols = enabledProtocols;
+ this.platformName = platformName;
+ this.platformVersion = platformVersion;
+ this.pluginVersion = pluginVersion;
+ }
+
+ public String getJavaVersion() {
+ return javaVersion;
+ }
+
+ public String getOperatingSystem() {
+ return operatingSystem;
+ }
+
+ public int getServerProtocol() {
+ return serverProtocol;
+ }
+
+ public Set getEnabledProtocols() {
+ return enabledProtocols;
+ }
+
+ public String getPlatformName() {
+ return platformName;
+ }
+
+ public String getPlatformVersion() {
+ return platformVersion;
+ }
+
+ public String getPluginVersion() {
+ return pluginVersion;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/base/ProtocolInfo.java b/common/src/main/java/us/myles/ViaVersion/protocols/base/ProtocolInfo.java
index 855d2bfbf..565eab34b 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/base/ProtocolInfo.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/base/ProtocolInfo.java
@@ -1,7 +1,5 @@
package us.myles.ViaVersion.protocols.base;
-import lombok.Getter;
-import lombok.Setter;
import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
@@ -9,8 +7,6 @@ import us.myles.ViaVersion.packets.State;
import java.util.UUID;
-@Getter
-@Setter
public class ProtocolInfo extends StoredObject {
private State state = State.HANDSHAKE;
private int protocolVersion = -1;
@@ -22,4 +18,52 @@ public class ProtocolInfo extends StoredObject {
public ProtocolInfo(UserConnection user) {
super(user);
}
+
+ public State getState() {
+ return state;
+ }
+
+ public void setState(State state) {
+ this.state = state;
+ }
+
+ public int getProtocolVersion() {
+ return protocolVersion;
+ }
+
+ public void setProtocolVersion(int protocolVersion) {
+ this.protocolVersion = protocolVersion;
+ }
+
+ public int getServerProtocolVersion() {
+ return serverProtocolVersion;
+ }
+
+ public void setServerProtocolVersion(int serverProtocolVersion) {
+ this.serverProtocolVersion = serverProtocolVersion;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public UUID getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(UUID uuid) {
+ this.uuid = uuid;
+ }
+
+ public ProtocolPipeline getPipeline() {
+ return pipeline;
+ }
+
+ public void setPipeline(ProtocolPipeline pipeline) {
+ this.pipeline = pipeline;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java
index d1fef3f43..7298016be 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_10to1_9_3/storage/ResourcePackTracker.java
@@ -1,18 +1,27 @@
package us.myles.ViaVersion.protocols.protocol1_10to1_9_3.storage;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection;
-@Getter
-@Setter
-@ToString
public class ResourcePackTracker extends StoredObject {
private String lastHash = "";
public ResourcePackTracker(UserConnection user) {
super(user);
}
+
+ public String getLastHash() {
+ return lastHash;
+ }
+
+ public void setLastHash(String lastHash) {
+ this.lastHash = lastHash;
+ }
+
+ @Override
+ public String toString() {
+ return "ResourcePackTracker{" +
+ "lastHash='" + lastHash + '\'' +
+ '}';
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/storage/ItemTransaction.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/storage/ItemTransaction.java
index 9ae0109c2..00441065c 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/storage/ItemTransaction.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_12to1_11_1/storage/ItemTransaction.java
@@ -1,14 +1,34 @@
package us.myles.ViaVersion.protocols.protocol1_12to1_11_1.storage;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.ToString;
-
-@AllArgsConstructor
-@ToString
-@Getter
public class ItemTransaction {
- private short windowId;
- private short slotId;
- private short actionId;
+ private final short windowId;
+ private final short slotId;
+ private final short actionId;
+
+ public ItemTransaction(short windowId, short slotId, short actionId) {
+ this.windowId = windowId;
+ this.slotId = slotId;
+ this.actionId = actionId;
+ }
+
+ public short getWindowId() {
+ return windowId;
+ }
+
+ public short getSlotId() {
+ return slotId;
+ }
+
+ public short getActionId() {
+ return actionId;
+ }
+
+ @Override
+ public String toString() {
+ return "ItemTransaction{" +
+ "windowId=" + windowId +
+ ", slotId=" + slotId +
+ ", actionId=" + actionId +
+ '}';
+ }
}
\ No newline at end of file
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java
index bde68c242..a9fa72eec 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/ParticleRewriter.java
@@ -1,7 +1,5 @@
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.minecraft.item.Item;
import us.myles.ViaVersion.api.type.Type;
@@ -162,18 +160,27 @@ public class ParticleRewriter {
Particle handler(Particle particle, Integer[] data);
}
- @Data
- @RequiredArgsConstructor
private static class NewParticle {
private final int id;
private final ParticleDataHandler handler;
+ public NewParticle(int id, ParticleDataHandler handler) {
+ this.id = id;
+ this.handler = handler;
+ }
+
public Particle handle(Particle particle, Integer[] data) {
if (handler != null)
return handler.handler(particle, data);
return particle;
}
+
+ public int getId() {
+ return id;
+ }
+
+ public ParticleDataHandler getHandler() {
+ return handler;
+ }
}
-
-
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/RecipeData.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/RecipeData.java
index 0be032fbe..4290b798e 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/RecipeData.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/RecipeData.java
@@ -1,8 +1,6 @@
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data;
import com.google.gson.reflect.TypeToken;
-import lombok.Data;
-import lombok.NonNull;
import us.myles.ViaVersion.api.minecraft.item.Item;
import us.myles.ViaVersion.util.GsonUtil;
@@ -33,9 +31,7 @@ public class RecipeData {
}
}
- @Data
public static class Recipe {
- @NonNull
private String type;
private String group;
private int width;
@@ -45,5 +41,77 @@ public class RecipeData {
private Item[] ingredient;
private Item[][] ingredients;
private Item result;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getGroup() {
+ return group;
+ }
+
+ public void setGroup(String group) {
+ this.group = group;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public void setWidth(int width) {
+ this.width = width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public void setHeight(int height) {
+ this.height = height;
+ }
+
+ public float getExperience() {
+ return experience;
+ }
+
+ public void setExperience(float experience) {
+ this.experience = experience;
+ }
+
+ public int getCookingTime() {
+ return cookingTime;
+ }
+
+ public void setCookingTime(int cookingTime) {
+ this.cookingTime = cookingTime;
+ }
+
+ public Item[] getIngredient() {
+ return ingredient;
+ }
+
+ public void setIngredient(Item[] ingredient) {
+ this.ingredient = ingredient;
+ }
+
+ public Item[][] getIngredients() {
+ return ingredients;
+ }
+
+ public void setIngredients(Item[][] ingredients) {
+ this.ingredients = ingredients;
+ }
+
+ public Item getResult() {
+ return result;
+ }
+
+ public void setResult(Item result) {
+ this.result = result;
+ }
}
}
\ No newline at end of file
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/SoundSource.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/SoundSource.java
index 0d6ac2c44..c5a837e38 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/SoundSource.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/SoundSource.java
@@ -1,12 +1,7 @@
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
import java.util.Optional;
-@Getter
-@AllArgsConstructor
public enum SoundSource {
MASTER("master", 0),
MUSIC("music", 1),
@@ -22,10 +17,23 @@ public enum SoundSource {
private final String name;
private final int id;
+ SoundSource(String name, int id) {
+ this.name = name;
+ this.id = id;
+ }
+
public static Optional findBySource(String source) {
for (SoundSource item : SoundSource.values())
if (item.name.equalsIgnoreCase(source))
return Optional.of(item);
return Optional.empty();
}
+
+ public String getName() {
+ return name;
+ }
+
+ public int getId() {
+ return id;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
index a15ce7004..dfdbf1b7c 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockStorage.java
@@ -1,7 +1,5 @@
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage;
-import lombok.AllArgsConstructor;
-import lombok.Data;
import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.minecraft.Position;
@@ -68,11 +66,29 @@ public class BlockStorage extends StoredObject {
return blocks.remove(position);
}
- @Data
- @AllArgsConstructor
public static class ReplacementData {
private int original;
private int replacement;
- }
+ public ReplacementData(int original, int replacement) {
+ this.original = original;
+ this.replacement = replacement;
+ }
+
+ public int getOriginal() {
+ return original;
+ }
+
+ public void setOriginal(int original) {
+ this.original = original;
+ }
+
+ public int getReplacement() {
+ return replacement;
+ }
+
+ public void setReplacement(int replacement) {
+ this.replacement = replacement;
+ }
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
index 775523167..b3d7e99c4 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/TabCompleteTracker.java
@@ -1,15 +1,11 @@
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage;
-import lombok.Getter;
-import lombok.Setter;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.type.Type;
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
-@Getter
-@Setter
public class TabCompleteTracker extends StoredObject {
private int transactionId;
private String input;
@@ -33,4 +29,36 @@ public class TabCompleteTracker extends StoredObject {
}
lastTabComplete = null;
}
+
+ public int getTransactionId() {
+ return transactionId;
+ }
+
+ public void setTransactionId(int transactionId) {
+ this.transactionId = transactionId;
+ }
+
+ public String getInput() {
+ return input;
+ }
+
+ public void setInput(final String input) {
+ this.input = input;
+ }
+
+ public String getLastTabComplete() {
+ return lastTabComplete;
+ }
+
+ public void setLastTabComplete(String lastTabComplete) {
+ this.lastTabComplete = lastTabComplete;
+ }
+
+ public long getTimeToSend() {
+ return timeToSend;
+ }
+
+ public void setTimeToSend(long timeToSend) {
+ this.timeToSend = timeToSend;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java
index 9dcca3354..5e9be98a2 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/storage/ClientWorld.java
@@ -1,11 +1,9 @@
package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2.storage;
-import lombok.Getter;
import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.minecraft.Environment;
-@Getter
public class ClientWorld extends StoredObject {
private Environment environment;
@@ -13,6 +11,10 @@ public class ClientWorld extends StoredObject {
super(user);
}
+ public Environment getEnvironment() {
+ return environment;
+ }
+
public void setEnvironment(int environmentId) {
this.environment = getEnvFromId(environmentId);
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java
index 1dd083af0..f302dbe88 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ArmorType.java
@@ -1,13 +1,8 @@
package us.myles.ViaVersion.protocols.protocol1_9to1_8;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
import java.util.HashMap;
import java.util.Map;
-@RequiredArgsConstructor
-@Getter
public enum ArmorType {
LEATHER_HELMET(1, 298, "minecraft:leather_helmet"),
@@ -32,7 +27,7 @@ public enum ArmorType {
GOLD_BOOTS(1, 317, "minecraft:gold_boots"),
NONE(0, 0, "none");
- private static Map armor;
+ private static final Map armor;
static {
armor = new HashMap<>();
@@ -45,6 +40,20 @@ public enum ArmorType {
private final int id;
private final String type;
+ ArmorType(int armorPoints, int id, String type) {
+ this.armorPoints = armorPoints;
+ this.id = id;
+ this.type = type;
+ }
+
+ public int getArmorPoints() {
+ return armorPoints;
+ }
+
+ public String getType() {
+ return type;
+ }
+
/**
* Find an armour type by the item id
*
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/GameMode.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/GameMode.java
index d3e31c239..cb69ee7d3 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/GameMode.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/GameMode.java
@@ -1,10 +1,5 @@
package us.myles.ViaVersion.protocols.protocol1_9to1_8.chat;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-@Getter
public enum GameMode {
SURVIVAL(0, "Survival Mode"),
CREATIVE(1, "Creative Mode"),
@@ -14,6 +9,19 @@ public enum GameMode {
private final int id;
private final String text;
+ GameMode(int id, String text) {
+ this.id = id;
+ this.text = text;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public String getText() {
+ return text;
+ }
+
public static GameMode getById(int id) {
for (GameMode gm : GameMode.values())
if (gm.getId() == id)
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetaIndex.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
index 8c6340d5d..1f05bc09b 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetaIndex.java
@@ -1,6 +1,5 @@
package us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata;
-import lombok.Getter;
import us.myles.ViaVersion.api.Pair;
import us.myles.ViaVersion.api.entities.Entity1_10Types;
import us.myles.ViaVersion.api.entities.EntityType;
@@ -12,7 +11,6 @@ import java.util.Optional;
import static us.myles.ViaVersion.api.entities.Entity1_10Types.EntityType.*;
-@Getter
public enum MetaIndex {
// entity
@@ -172,6 +170,26 @@ public enum MetaIndex {
this.newType = newType;
}
+ public Entity1_10Types.EntityType getClazz() {
+ return clazz;
+ }
+
+ public int getNewIndex() {
+ return newIndex;
+ }
+
+ public MetaType1_9 getNewType() {
+ return newType;
+ }
+
+ public MetaType1_8 getOldType() {
+ return oldType;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
private static Optional getIndex(EntityType type, int index) {
Pair pair = new Pair<>(type, index);
return Optional.ofNullable(metadataRewrites.get(pair));
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
index 6561afdcf..2648b103e 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java
@@ -291,8 +291,8 @@ public class WorldPackets {
wrapper.clearInputBuffer();
// First set this packet ID to Block placement
wrapper.setId(0x08);
- wrapper.write(Type.LONG, -1L);
- wrapper.write(Type.BYTE, (byte) 255);
+ wrapper.write(Type.POSITION, new Position(-1, (short) -1, -1));
+ wrapper.write(Type.UNSIGNED_BYTE, (short) 255);
// Write item in hand
Item item = Protocol1_9To1_8.getHandItem(wrapper.user());
// Blocking patch
@@ -315,9 +315,9 @@ public class WorldPackets {
}
wrapper.write(Type.ITEM, item);
- wrapper.write(Type.BYTE, (byte) 0);
- wrapper.write(Type.BYTE, (byte) 0);
- wrapper.write(Type.BYTE, (byte) 0);
+ wrapper.write(Type.UNSIGNED_BYTE, (short) 0);
+ wrapper.write(Type.UNSIGNED_BYTE, (short) 0);
+ wrapper.write(Type.UNSIGNED_BYTE, (short) 0);
}
});
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
index 4a8c46f33..1eaf59ba9 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/providers/BulkChunkTranslatorProvider.java
@@ -1,6 +1,5 @@
package us.myles.ViaVersion.protocols.protocol1_9to1_8.providers;
-import lombok.Data;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.platform.providers.Provider;
import us.myles.ViaVersion.api.type.Type;
@@ -74,7 +73,6 @@ public class BulkChunkTranslatorProvider implements Provider {
return true;
}
- @Data
private static class ChunkBulkSection {
private int x;
private int z;
@@ -93,5 +91,45 @@ public class BulkChunkTranslatorProvider implements Provider {
return bulkSection;
}
+
+ public int getX() {
+ return x;
+ }
+
+ public void setX(int x) {
+ this.x = x;
+ }
+
+ public int getZ() {
+ return z;
+ }
+
+ public void setZ(int z) {
+ this.z = z;
+ }
+
+ public int getBitMask() {
+ return bitMask;
+ }
+
+ public void setBitMask(int bitMask) {
+ this.bitMask = bitMask;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ public void setLength(int length) {
+ this.length = length;
+ }
+
+ public byte[] getData() {
+ return data;
+ }
+
+ public void setData(byte[] data) {
+ this.data = data;
+ }
}
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundCategory.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundCategory.java
index 2d058cfbd..23b52e2f3 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundCategory.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundCategory.java
@@ -1,13 +1,7 @@
package us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@RequiredArgsConstructor
-@Getter
public enum SoundCategory {
-
MASTER("master", 0),
MUSIC("music", 1),
RECORD("record", 2),
@@ -22,4 +16,16 @@ public enum SoundCategory {
private final String name;
private final int id;
+ SoundCategory(String name, int id) {
+ this.name = name;
+ this.id = id;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundEffect.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundEffect.java
index 6f8a2dd5f..5f4c04a84 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundEffect.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundEffect.java
@@ -1,12 +1,9 @@
package us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds;
-import lombok.Getter;
-
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-@Getter
public enum SoundEffect {
MOB_HORSE_ZOMBIE_IDLE("mob.horse.zombie.idle", "entity.zombie_horse.ambient", SoundCategory.NEUTRAL),
@@ -261,7 +258,7 @@ public enum SoundEffect {
private final SoundCategory category;
private final boolean breaksound;
- private static Map effects;
+ private static final Map effects;
static {
effects = new HashMap<>();
@@ -289,4 +286,19 @@ public enum SoundEffect {
return effects.get(name);
}
+ public String getName() {
+ return name;
+ }
+
+ public String getNewName() {
+ return newName;
+ }
+
+ public SoundCategory getCategory() {
+ return category;
+ }
+
+ public boolean isBreaksound() {
+ return breaksound;
+ }
}
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/ClientChunks.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/ClientChunks.java
index e4149ef73..aab46341f 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/ClientChunks.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/ClientChunks.java
@@ -1,7 +1,6 @@
package us.myles.ViaVersion.protocols.protocol1_9to1_8.storage;
import com.google.common.collect.Sets;
-import lombok.Getter;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.data.StoredObject;
import us.myles.ViaVersion.api.data.UserConnection;
@@ -10,7 +9,6 @@ import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.BulkChunkTransla
import java.util.List;
import java.util.Set;
-@Getter
public class ClientChunks extends StoredObject {
private final Set loadedChunks = Sets.newConcurrentHashSet();
private final Set bulkChunks = Sets.newConcurrentHashSet();
@@ -26,4 +24,12 @@ public class ClientChunks extends StoredObject {
public List