Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Package rename to net.minestom.server

This commit is contained in:
Felix Cravic 2020-04-24 03:25:58 +02:00
parent 5d7f538ab7
commit 7daac5e610
355 changed files with 1466 additions and 1484 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -3,7 +3,7 @@ plugins {
id 'net.ltgt.apt' version '0.10'
}
group 'fr.themode.minestom'
group 'net.minestom.server'
version '1.0'
sourceCompatibility = 1.11

22
src/main/java/fr/themode/demo/Main.java
View File

@ -4,17 +4,17 @@ import fr.themode.demo.blocks.StoneBlock;
import fr.themode.demo.blocks.UpdatableBlockDemo;
import fr.themode.demo.commands.HealthCommand;
import fr.themode.demo.commands.SimpleCommand;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.command.CommandManager;
import fr.themode.minestom.instance.block.BlockManager;
import fr.themode.minestom.instance.block.rule.vanilla.RedstonePlacementRule;
import fr.themode.minestom.item.ItemStack;
import fr.themode.minestom.item.Material;
import fr.themode.minestom.net.packet.server.play.DeclareRecipesPacket;
import fr.themode.minestom.recipe.RecipeManager;
import fr.themode.minestom.recipe.ShapelessRecipe;
import fr.themode.minestom.utils.time.TimeUnit;
import fr.themode.minestom.utils.time.UpdateOption;
import net.minestom.server.MinecraftServer;
import net.minestom.server.command.CommandManager;
import net.minestom.server.instance.block.BlockManager;
import net.minestom.server.instance.block.rule.vanilla.RedstonePlacementRule;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.network.packet.server.play.DeclareRecipesPacket;
import net.minestom.server.recipe.RecipeManager;
import net.minestom.server.recipe.ShapelessRecipe;
import net.minestom.server.utils.time.TimeUnit;
import net.minestom.server.utils.time.UpdateOption;
public class Main {

56
src/main/java/fr/themode/demo/PlayerInit.java
View File

@ -3,23 +3,23 @@ package fr.themode.demo;
import fr.themode.demo.entity.ChickenCreature;
import fr.themode.demo.generator.ChunkGeneratorDemo;
import fr.themode.demo.generator.NoiseTestGenerator;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.benchmark.BenchmarkManager;
import fr.themode.minestom.benchmark.ThreadResult;
import fr.themode.minestom.entity.*;
import fr.themode.minestom.event.*;
import fr.themode.minestom.instance.InstanceContainer;
import fr.themode.minestom.inventory.Inventory;
import fr.themode.minestom.inventory.InventoryType;
import fr.themode.minestom.item.ItemStack;
import fr.themode.minestom.item.Material;
import fr.themode.minestom.net.ConnectionManager;
import fr.themode.minestom.timer.TaskRunnable;
import fr.themode.minestom.utils.MathUtils;
import fr.themode.minestom.utils.Position;
import fr.themode.minestom.utils.Vector;
import fr.themode.minestom.utils.time.TimeUnit;
import fr.themode.minestom.utils.time.UpdateOption;
import net.minestom.server.MinecraftServer;
import net.minestom.server.benchmark.BenchmarkManager;
import net.minestom.server.benchmark.ThreadResult;
import net.minestom.server.entity.*;
import net.minestom.server.event.*;
import net.minestom.server.instance.InstanceContainer;
import net.minestom.server.inventory.Inventory;
import net.minestom.server.inventory.InventoryType;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.network.ConnectionManager;
import net.minestom.server.timer.TaskRunnable;
import net.minestom.server.utils.MathUtils;
import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector;
import net.minestom.server.utils.time.TimeUnit;
import net.minestom.server.utils.time.UpdateOption;
import java.util.Map;
import java.util.UUID;
@ -88,6 +88,7 @@ public class PlayerInit {
connectionManager.setPacketConsumer((player, packet) -> {
// Listen to all received packet
// Returning true means cancelling the packet
return false;
});
@ -150,26 +151,9 @@ public class PlayerInit {
player.setGameMode(GameMode.SURVIVAL);
player.teleport(new Position(0, 75, 0));
/*Random random = new Random();
for (int i = 0; i < 50; i++) {
ChickenCreature chickenCreature = new ChickenCreature();
chickenCreature.refreshPosition(random.nextInt(100), 65, random.nextInt(100));
chickenCreature.setInstance(getInstance());
}*/
//chickenCreature.addPassenger(this);
/*for (int ix = 0; ix < 4; ix++)
for (int iz = 0; iz < 4; iz++) {
ItemEntity itemEntity = new ItemEntity(new ItemStack(1, (byte) 32));
itemEntity.refreshPosition(ix, 68, iz);
//itemEntity.setNoGravity(true);
itemEntity.setInstance(getInstance());
//itemEntity.remove();
}*/
ItemStack item = new ItemStack((short) 1, (byte) 43);
item.setDisplayName("LE NOM DE L'ITEM");
//item.getLore().add("lol le lore");
item.setDisplayName("Item name");
item.getLore().add("a lore line");
player.getInventory().addItemStack(item);
Inventory inventory = new Inventory(InventoryType.CHEST_1_ROW, "Test inventory");

12
src/main/java/fr/themode/demo/blocks/StoneBlock.java
View File

@ -1,11 +1,11 @@
package fr.themode.demo.blocks;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.time.UpdateOption;
import net.minestom.server.data.Data;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.time.UpdateOption;
public class StoneBlock extends CustomBlock {

14
src/main/java/fr/themode/demo/blocks/UpdatableBlockDemo.java
View File

@ -1,12 +1,12 @@
package fr.themode.demo.blocks;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.time.TimeUnit;
import fr.themode.minestom.utils.time.UpdateOption;
import net.minestom.server.data.Data;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.time.TimeUnit;
import net.minestom.server.utils.time.UpdateOption;
public class UpdatableBlockDemo extends CustomBlock {

2
src/main/java/fr/themode/demo/commands/HealthCommand.java
View File

@ -5,7 +5,7 @@ import fr.themode.command.Command;
import fr.themode.command.arguments.Argument;
import fr.themode.command.arguments.ArgumentType;
import fr.themode.command.arguments.number.ArgumentNumber;
import fr.themode.minestom.entity.Player;
import net.minestom.server.entity.Player;
public class HealthCommand extends Command<Player> {

6
src/main/java/fr/themode/demo/commands/SimpleCommand.java
View File

@ -1,9 +1,9 @@
package fr.themode.demo.commands;
import fr.themode.demo.entity.ChickenCreature;
import fr.themode.minestom.command.CommandProcessor;
import fr.themode.minestom.entity.EntityCreature;
import fr.themode.minestom.entity.Player;
import net.minestom.server.command.CommandProcessor;
import net.minestom.server.entity.EntityCreature;
import net.minestom.server.entity.Player;
public class SimpleCommand implements CommandProcessor {
@Override

14
src/main/java/fr/themode/demo/entity/ChickenCreature.java
View File

@ -1,12 +1,12 @@
package fr.themode.demo.entity;
import fr.themode.minestom.entity.Entity;
import fr.themode.minestom.entity.EntityCreature;
import fr.themode.minestom.entity.EntityType;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.entity.vehicle.PlayerVehicleInformation;
import fr.themode.minestom.utils.Position;
import fr.themode.minestom.utils.Vector;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.EntityCreature;
import net.minestom.server.entity.EntityType;
import net.minestom.server.entity.Player;
import net.minestom.server.entity.vehicle.PlayerVehicleInformation;
import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector;
public class ChickenCreature extends EntityCreature {

6
src/main/java/fr/themode/demo/entity/TestArrow.java
View File

@ -1,8 +1,8 @@
package fr.themode.demo.entity;
import fr.themode.minestom.entity.EntityType;
import fr.themode.minestom.entity.LivingEntity;
import fr.themode.minestom.entity.ObjectEntity;
import net.minestom.server.entity.EntityType;
import net.minestom.server.entity.LivingEntity;
import net.minestom.server.entity.ObjectEntity;
public class TestArrow extends ObjectEntity {

6
src/main/java/fr/themode/demo/generator/ChunkGeneratorDemo.java
View File

@ -1,8 +1,8 @@
package fr.themode.demo.generator;
import fr.themode.minestom.instance.Biome;
import fr.themode.minestom.instance.ChunkGenerator;
import fr.themode.minestom.instance.batch.ChunkBatch;
import net.minestom.server.instance.Biome;
import net.minestom.server.instance.ChunkGenerator;
import net.minestom.server.instance.batch.ChunkBatch;
import java.util.Random;

8
src/main/java/fr/themode/demo/generator/NoiseTestGenerator.java
View File

@ -1,9 +1,9 @@
package fr.themode.demo.generator;
import fr.themode.minestom.instance.Biome;
import fr.themode.minestom.instance.ChunkGenerator;
import fr.themode.minestom.instance.batch.ChunkBatch;
import fr.themode.minestom.utils.noise.FastNoise;
import net.minestom.server.instance.Biome;
import net.minestom.server.instance.ChunkGenerator;
import net.minestom.server.instance.batch.ChunkBatch;
import net.minestom.server.utils.noise.FastNoise;
import java.util.Random;

5
src/main/java/fr/themode/minestom/event/Event.java
View File

@ -1,5 +0,0 @@
package fr.themode.minestom.event;
public class Event {
}

10
src/main/java/fr/themode/minestom/instance/block/UpdateConsumer.java
View File

@ -1,10 +0,0 @@
package fr.themode.minestom.instance.block;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.utils.BlockPosition;
@FunctionalInterface
public interface UpdateConsumer {
void update(Instance instance, BlockPosition blockPosition, Data data);
}

4
src/main/java/fr/themode/minestom/inventory/InventoryRule.java
View File

@ -1,4 +0,0 @@
package fr.themode.minestom.inventory;
public class InventoryRule {
}

24
src/main/java/fr/themode/minestom/listener/CreativeInventoryActionListener.java
View File

@ -1,24 +0,0 @@
package fr.themode.minestom.listener;
import fr.themode.minestom.entity.GameMode;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.inventory.PlayerInventory;
import fr.themode.minestom.item.ItemStack;
import fr.themode.minestom.net.packet.client.play.ClientCreativeInventoryActionPacket;
import static fr.themode.minestom.utils.inventory.PlayerInventoryUtils.OFFSET;
import static fr.themode.minestom.utils.inventory.PlayerInventoryUtils.convertSlot;
public class CreativeInventoryActionListener {
public static void listener(ClientCreativeInventoryActionPacket packet, Player player) {
if (player.getGameMode() != GameMode.CREATIVE)
return;
ItemStack item = packet.item;
short slot = packet.slot;
PlayerInventory inventory = player.getInventory();
inventory.setItemStack(convertSlot(slot, OFFSET), item);
}
}

5
src/main/java/fr/themode/minestom/net/ConnectionState.java
View File

@ -1,5 +0,0 @@
package fr.themode.minestom.net;
public enum ConnectionState {
UNKNOWN, STATUS, LOGIN, PLAY;
}

9
src/main/java/fr/themode/minestom/net/packet/client/ClientPacket.java
View File

@ -1,9 +0,0 @@
package fr.themode.minestom.net.packet.client;
import fr.themode.minestom.net.packet.PacketReader;
public interface ClientPacket {
void read(PacketReader reader);
}

11
src/main/java/fr/themode/minestom/net/packet/client/ClientPreplayPacket.java
View File

@ -1,11 +0,0 @@
package fr.themode.minestom.net.packet.client;
import fr.themode.minestom.net.ConnectionManager;
import fr.themode.minestom.net.player.PlayerConnection;
public interface ClientPreplayPacket extends ClientPacket {
void process(PlayerConnection connection, ConnectionManager connectionManager);
}

11
src/main/java/fr/themode/minestom/net/packet/server/ServerPacket.java
View File

@ -1,11 +0,0 @@
package fr.themode.minestom.net.packet.server;
import fr.themode.minestom.net.packet.PacketWriter;
public interface ServerPacket {
void write(PacketWriter writer);
int getId();
}

36
src/main/java/fr/themode/minestom/MinecraftServer.java → src/main/java/net/minestom/server/MinecraftServer.java
View File

@ -1,22 +1,22 @@
package fr.themode.minestom;
package net.minestom.server;
import fr.themode.minestom.benchmark.BenchmarkManager;
import fr.themode.minestom.command.CommandManager;
import fr.themode.minestom.data.DataManager;
import fr.themode.minestom.entity.EntityManager;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.instance.InstanceManager;
import fr.themode.minestom.instance.block.BlockManager;
import fr.themode.minestom.listener.manager.PacketListenerManager;
import fr.themode.minestom.net.ConnectionManager;
import fr.themode.minestom.net.PacketProcessor;
import fr.themode.minestom.net.netty.NettyServer;
import fr.themode.minestom.net.packet.server.play.ServerDifficultyPacket;
import fr.themode.minestom.recipe.RecipeManager;
import fr.themode.minestom.registry.RegistryMain;
import fr.themode.minestom.scoreboard.TeamManager;
import fr.themode.minestom.timer.SchedulerManager;
import fr.themode.minestom.world.Difficulty;
import net.minestom.server.benchmark.BenchmarkManager;
import net.minestom.server.command.CommandManager;
import net.minestom.server.data.DataManager;
import net.minestom.server.entity.EntityManager;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.InstanceManager;
import net.minestom.server.instance.block.BlockManager;
import net.minestom.server.listener.manager.PacketListenerManager;
import net.minestom.server.network.ConnectionManager;
import net.minestom.server.network.PacketProcessor;
import net.minestom.server.network.netty.NettyServer;
import net.minestom.server.network.packet.server.play.ServerDifficultyPacket;
import net.minestom.server.recipe.RecipeManager;
import net.minestom.server.registry.RegistryMain;
import net.minestom.server.scoreboard.TeamManager;
import net.minestom.server.timer.SchedulerManager;
import net.minestom.server.world.Difficulty;
public class MinecraftServer {

16
src/main/java/fr/themode/minestom/UpdateManager.java → src/main/java/net/minestom/server/UpdateManager.java
View File

@ -1,12 +1,12 @@
package fr.themode.minestom;
package net.minestom.server;
import fr.themode.minestom.entity.EntityManager;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.instance.InstanceManager;
import fr.themode.minestom.net.ConnectionManager;
import fr.themode.minestom.net.packet.server.play.KeepAlivePacket;
import fr.themode.minestom.timer.SchedulerManager;
import fr.themode.minestom.utils.thread.MinestomThread;
import net.minestom.server.entity.EntityManager;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.InstanceManager;
import net.minestom.server.network.ConnectionManager;
import net.minestom.server.network.packet.server.play.KeepAlivePacket;
import net.minestom.server.timer.SchedulerManager;
import net.minestom.server.utils.thread.MinestomThread;
import java.util.concurrent.ExecutorService;

8
src/main/java/fr/themode/minestom/Viewable.java → src/main/java/net/minestom/server/Viewable.java
View File

@ -1,8 +1,8 @@
package fr.themode.minestom;
package net.minestom.server;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.net.PacketWriterUtils;
import fr.themode.minestom.net.packet.server.ServerPacket;
import net.minestom.server.entity.Player;
import net.minestom.server.network.PacketWriterUtils;
import net.minestom.server.network.packet.server.ServerPacket;
import java.util.HashSet;
import java.util.Set;

8
src/main/java/fr/themode/minestom/benchmark/BenchmarkManager.java → src/main/java/net/minestom/server/benchmark/BenchmarkManager.java
View File

@ -1,14 +1,14 @@
package fr.themode.minestom.benchmark;
package net.minestom.server.benchmark;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.utils.time.UpdateOption;
import net.minestom.server.MinecraftServer;
import net.minestom.server.utils.time.UpdateOption;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadInfo;
import java.lang.management.ThreadMXBean;
import java.util.*;
import static fr.themode.minestom.MinecraftServer.*;
import static net.minestom.server.MinecraftServer.*;
public class BenchmarkManager {

2
src/main/java/fr/themode/minestom/benchmark/ThreadResult.java → src/main/java/net/minestom/server/benchmark/ThreadResult.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.benchmark;
package net.minestom.server.benchmark;
public class ThreadResult {

4
src/main/java/fr/themode/minestom/bossbar/BarColor.java → src/main/java/net/minestom/server/bossbar/BarColor.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.bossbar;
package net.minestom.server.bossbar;
public enum BarColor {
@ -8,6 +8,6 @@ public enum BarColor {
GREEN,
YELLOW,
PURPLE,
WHITE;
WHITE
}

4
src/main/java/fr/themode/minestom/bossbar/BarDivision.java → src/main/java/net/minestom/server/bossbar/BarDivision.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.bossbar;
package net.minestom.server.bossbar;
public enum BarDivision {
@ -6,6 +6,6 @@ public enum BarDivision {
SEGMENT_6,
SEGMENT_10,
SEGMENT_12,
SEGMENT_20;
SEGMENT_20
}

8
src/main/java/fr/themode/minestom/bossbar/BossBar.java → src/main/java/net/minestom/server/bossbar/BossBar.java
View File

@ -1,8 +1,8 @@
package fr.themode.minestom.bossbar;
package net.minestom.server.bossbar;
import fr.themode.minestom.Viewable;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.net.packet.server.play.BossBarPacket;
import net.minestom.server.Viewable;
import net.minestom.server.entity.Player;
import net.minestom.server.network.packet.server.play.BossBarPacket;
import java.util.Collections;
import java.util.Set;

2
src/main/java/fr/themode/minestom/chat/Chat.java → src/main/java/net/minestom/server/chat/Chat.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.chat;
package net.minestom.server.chat;
import club.thectm.minecraft.text.LegacyText;
import club.thectm.minecraft.text.TextObject;

4
src/main/java/fr/themode/minestom/chat/ChatColor.java → src/main/java/net/minestom/server/chat/ChatColor.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.chat;
package net.minestom.server.chat;
import fr.themode.minestom.utils.HexUtils;
import net.minestom.server.utils.HexUtils;
public enum ChatColor {

8
src/main/java/fr/themode/minestom/collision/BoundingBox.java → src/main/java/net/minestom/server/collision/BoundingBox.java
View File

@ -1,8 +1,8 @@
package fr.themode.minestom.collision;
package net.minestom.server.collision;
import fr.themode.minestom.entity.Entity;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.Position;
import net.minestom.server.entity.Entity;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.Position;
/**
* See https://wiki.vg/Entity_metadata#Mobs_2

10
src/main/java/fr/themode/minestom/collision/CollisionUtils.java → src/main/java/net/minestom/server/collision/CollisionUtils.java
View File

@ -1,9 +1,9 @@
package fr.themode.minestom.collision;
package net.minestom.server.collision;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.instance.block.Block;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.Position;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.block.Block;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.Position;
public class CollisionUtils {

8
src/main/java/fr/themode/minestom/command/CommandManager.java → src/main/java/net/minestom/server/command/CommandManager.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.command;
package net.minestom.server.command;
import fr.themode.command.Command;
import fr.themode.command.CommandDispatcher;
@ -7,9 +7,9 @@ import fr.themode.command.arguments.*;
import fr.themode.command.arguments.number.ArgumentDouble;
import fr.themode.command.arguments.number.ArgumentFloat;
import fr.themode.command.arguments.number.ArgumentInteger;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.net.packet.server.play.DeclareCommandsPacket;
import fr.themode.minestom.utils.ArrayUtils;
import net.minestom.server.entity.Player;
import net.minestom.server.network.packet.server.play.DeclareCommandsPacket;
import net.minestom.server.utils.ArrayUtils;
import java.util.ArrayList;
import java.util.HashMap;

4
src/main/java/fr/themode/minestom/command/CommandProcessor.java → src/main/java/net/minestom/server/command/CommandProcessor.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.command;
package net.minestom.server.command;
import fr.themode.minestom.entity.Player;
import net.minestom.server.entity.Player;
public interface CommandProcessor {

6
src/main/java/fr/themode/minestom/data/Data.java → src/main/java/net/minestom/server/data/Data.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.data;
package net.minestom.server.data;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.utils.PrimitiveConversion;
import net.minestom.server.MinecraftServer;
import net.minestom.server.utils.PrimitiveConversion;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;

8
src/main/java/fr/themode/minestom/data/DataContainer.java → src/main/java/net/minestom/server/data/DataContainer.java
View File

@ -1,8 +1,8 @@
package fr.themode.minestom.data;
package net.minestom.server.data;
import fr.themode.minestom.io.DataReader;
import fr.themode.minestom.io.IOManager;
import fr.themode.minestom.utils.CompressionUtils;
import net.minestom.server.io.DataReader;
import net.minestom.server.io.IOManager;
import net.minestom.server.utils.CompressionUtils;
import java.io.File;
import java.io.FileNotFoundException;

8
src/main/java/fr/themode/minestom/data/DataManager.java → src/main/java/net/minestom/server/data/DataManager.java
View File

@ -1,8 +1,8 @@
package fr.themode.minestom.data;
package net.minestom.server.data;
import fr.themode.minestom.data.type.CharacterData;
import fr.themode.minestom.data.type.*;
import fr.themode.minestom.utils.PrimitiveConversion;
import net.minestom.server.data.type.CharacterData;
import net.minestom.server.data.type.*;
import net.minestom.server.utils.PrimitiveConversion;
import java.util.HashMap;
import java.util.Map;

2
src/main/java/fr/themode/minestom/data/DataType.java → src/main/java/net/minestom/server/data/DataType.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.data;
package net.minestom.server.data;
public abstract class DataType<T> {

4
src/main/java/fr/themode/minestom/data/type/BooleanData.java → src/main/java/net/minestom/server/data/type/BooleanData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
public class BooleanData extends DataType<Boolean> {
@Override

4
src/main/java/fr/themode/minestom/data/type/ByteData.java → src/main/java/net/minestom/server/data/type/ByteData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
public class ByteData extends DataType<Byte> {
@Override

4
src/main/java/fr/themode/minestom/data/type/CharacterData.java → src/main/java/net/minestom/server/data/type/CharacterData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
import java.nio.ByteBuffer;

8
src/main/java/fr/themode/minestom/data/type/DataData.java → src/main/java/net/minestom/server/data/type/DataData.java
View File

@ -1,8 +1,8 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.data.DataType;
import fr.themode.minestom.io.DataReader;
import net.minestom.server.data.Data;
import net.minestom.server.data.DataType;
import net.minestom.server.io.DataReader;
import java.io.IOException;

4
src/main/java/fr/themode/minestom/data/type/DoubleData.java → src/main/java/net/minestom/server/data/type/DoubleData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
import java.nio.ByteBuffer;

4
src/main/java/fr/themode/minestom/data/type/FloatData.java → src/main/java/net/minestom/server/data/type/FloatData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
import java.nio.ByteBuffer;

4
src/main/java/fr/themode/minestom/data/type/IntegerData.java → src/main/java/net/minestom/server/data/type/IntegerData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
import java.nio.ByteBuffer;

4
src/main/java/fr/themode/minestom/data/type/LongData.java → src/main/java/net/minestom/server/data/type/LongData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
import java.nio.ByteBuffer;

4
src/main/java/fr/themode/minestom/data/type/ShortData.java → src/main/java/net/minestom/server/data/type/ShortData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
import java.nio.ByteBuffer;

4
src/main/java/fr/themode/minestom/data/type/StringData.java → src/main/java/net/minestom/server/data/type/StringData.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.data.type;
package net.minestom.server.data.type;
import fr.themode.minestom.data.DataType;
import net.minestom.server.data.DataType;
public class StringData extends DataType<String> {

32
src/main/java/fr/themode/minestom/entity/Entity.java → src/main/java/net/minestom/server/entity/Entity.java
View File

@ -1,20 +1,20 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.Viewable;
import fr.themode.minestom.collision.BoundingBox;
import fr.themode.minestom.collision.CollisionUtils;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.data.DataContainer;
import fr.themode.minestom.event.Callback;
import fr.themode.minestom.event.CancellableEvent;
import fr.themode.minestom.event.Event;
import fr.themode.minestom.instance.Chunk;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.net.packet.PacketWriter;
import fr.themode.minestom.net.packet.server.play.*;
import fr.themode.minestom.net.player.PlayerConnection;
import fr.themode.minestom.utils.*;
import net.minestom.server.MinecraftServer;
import net.minestom.server.Viewable;
import net.minestom.server.collision.BoundingBox;
import net.minestom.server.collision.CollisionUtils;
import net.minestom.server.data.Data;
import net.minestom.server.data.DataContainer;
import net.minestom.server.event.Callback;
import net.minestom.server.event.CancellableEvent;
import net.minestom.server.event.Event;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.Instance;
import net.minestom.server.network.packet.PacketWriter;
import net.minestom.server.network.packet.server.play.*;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.utils.*;
import java.util.Collections;
import java.util.Map;

20
src/main/java/fr/themode/minestom/entity/EntityCreature.java → src/main/java/net/minestom/server/entity/EntityCreature.java
View File

@ -1,14 +1,14 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import fr.themode.minestom.collision.CollisionUtils;
import fr.themode.minestom.entity.pathfinding.EntityPathFinder;
import fr.themode.minestom.entity.property.Attribute;
import fr.themode.minestom.net.packet.server.play.*;
import fr.themode.minestom.net.player.PlayerConnection;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.ChunkUtils;
import fr.themode.minestom.utils.Position;
import fr.themode.minestom.utils.Vector;
import net.minestom.server.collision.CollisionUtils;
import net.minestom.server.entity.pathfinding.EntityPathFinder;
import net.minestom.server.entity.property.Attribute;
import net.minestom.server.network.packet.server.play.*;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.ChunkUtils;
import net.minestom.server.utils.Position;
import net.minestom.server.utils.Vector;
import java.util.LinkedList;

14
src/main/java/fr/themode/minestom/entity/EntityManager.java → src/main/java/net/minestom/server/entity/EntityManager.java
View File

@ -1,11 +1,11 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.event.PlayerLoginEvent;
import fr.themode.minestom.instance.Chunk;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.instance.InstanceManager;
import fr.themode.minestom.utils.thread.MinestomThread;
import net.minestom.server.MinecraftServer;
import net.minestom.server.event.PlayerLoginEvent;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.InstanceManager;
import net.minestom.server.utils.thread.MinestomThread;
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;

2
src/main/java/fr/themode/minestom/entity/EntityType.java → src/main/java/net/minestom/server/entity/EntityType.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;

6
src/main/java/fr/themode/minestom/entity/ExperienceOrb.java → src/main/java/net/minestom/server/entity/ExperienceOrb.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import fr.themode.minestom.net.packet.server.play.SpawnExperienceOrbPacket;
import fr.themode.minestom.net.player.PlayerConnection;
import net.minestom.server.network.packet.server.play.SpawnExperienceOrbPacket;
import net.minestom.server.network.player.PlayerConnection;
public class ExperienceOrb extends Entity {

2
src/main/java/fr/themode/minestom/entity/GameMode.java → src/main/java/net/minestom/server/entity/GameMode.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
public enum GameMode {

6
src/main/java/fr/themode/minestom/entity/ItemEntity.java → src/main/java/net/minestom/server/entity/ItemEntity.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import fr.themode.minestom.item.ItemStack;
import fr.themode.minestom.net.packet.PacketWriter;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.PacketWriter;
import java.util.function.Consumer;

24
src/main/java/fr/themode/minestom/entity/LivingEntity.java → src/main/java/net/minestom/server/entity/LivingEntity.java
View File

@ -1,16 +1,16 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import fr.themode.minestom.collision.BoundingBox;
import fr.themode.minestom.entity.property.Attribute;
import fr.themode.minestom.event.DeathEvent;
import fr.themode.minestom.event.PickupItemEvent;
import fr.themode.minestom.instance.Chunk;
import fr.themode.minestom.item.ItemStack;
import fr.themode.minestom.net.packet.PacketWriter;
import fr.themode.minestom.net.packet.server.play.CollectItemPacket;
import fr.themode.minestom.net.packet.server.play.EntityAnimationPacket;
import fr.themode.minestom.net.packet.server.play.EntityPropertiesPacket;
import fr.themode.minestom.utils.Position;
import net.minestom.server.collision.BoundingBox;
import net.minestom.server.entity.property.Attribute;
import net.minestom.server.event.DeathEvent;
import net.minestom.server.event.PickupItemEvent;
import net.minestom.server.instance.Chunk;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.PacketWriter;
import net.minestom.server.network.packet.server.play.CollectItemPacket;
import net.minestom.server.network.packet.server.play.EntityAnimationPacket;
import net.minestom.server.network.packet.server.play.EntityPropertiesPacket;
import net.minestom.server.utils.Position;
import java.util.Set;
import java.util.function.Consumer;

6
src/main/java/fr/themode/minestom/entity/ObjectEntity.java → src/main/java/net/minestom/server/entity/ObjectEntity.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import fr.themode.minestom.net.packet.server.play.SpawnEntityPacket;
import fr.themode.minestom.net.player.PlayerConnection;
import net.minestom.server.network.packet.server.play.SpawnEntityPacket;
import net.minestom.server.network.player.PlayerConnection;
public abstract class ObjectEntity extends Entity {

58
src/main/java/fr/themode/minestom/entity/Player.java → src/main/java/net/minestom/server/entity/Player.java
View File

@ -1,35 +1,35 @@
package fr.themode.minestom.entity;
package net.minestom.server.entity;
import club.thectm.minecraft.text.TextObject;
import com.google.gson.JsonObject;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.bossbar.BossBar;
import fr.themode.minestom.chat.Chat;
import fr.themode.minestom.collision.BoundingBox;
import fr.themode.minestom.entity.property.Attribute;
import fr.themode.minestom.entity.vehicle.PlayerVehicleInformation;
import fr.themode.minestom.event.*;
import fr.themode.minestom.instance.Chunk;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.inventory.Inventory;
import fr.themode.minestom.inventory.PlayerInventory;
import fr.themode.minestom.item.ItemStack;
import fr.themode.minestom.net.packet.client.ClientPlayPacket;
import fr.themode.minestom.net.packet.server.ServerPacket;
import fr.themode.minestom.net.packet.server.play.*;
import fr.themode.minestom.net.player.PlayerConnection;
import fr.themode.minestom.scoreboard.BelowNameScoreboard;
import fr.themode.minestom.scoreboard.Team;
import fr.themode.minestom.sound.Sound;
import fr.themode.minestom.sound.SoundCategory;
import fr.themode.minestom.stat.PlayerStatistic;
import fr.themode.minestom.utils.ArrayUtils;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.ChunkUtils;
import fr.themode.minestom.utils.Position;
import fr.themode.minestom.world.Dimension;
import fr.themode.minestom.world.LevelType;
import net.minestom.server.MinecraftServer;
import net.minestom.server.bossbar.BossBar;
import net.minestom.server.chat.Chat;
import net.minestom.server.collision.BoundingBox;
import net.minestom.server.entity.property.Attribute;
import net.minestom.server.entity.vehicle.PlayerVehicleInformation;
import net.minestom.server.event.*;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.inventory.Inventory;
import net.minestom.server.inventory.PlayerInventory;
import net.minestom.server.item.ItemStack;
import net.minestom.server.network.packet.client.ClientPlayPacket;
import net.minestom.server.network.packet.server.ServerPacket;
import net.minestom.server.network.packet.server.play.*;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.scoreboard.BelowNameScoreboard;
import net.minestom.server.scoreboard.Team;
import net.minestom.server.sound.Sound;
import net.minestom.server.sound.SoundCategory;
import net.minestom.server.stat.PlayerStatistic;
import net.minestom.server.utils.ArrayUtils;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.ChunkUtils;
import net.minestom.server.utils.Position;
import net.minestom.server.world.Dimension;
import net.minestom.server.world.LevelType;
import java.util.*;
import java.util.concurrent.ConcurrentLinkedQueue;

12
src/main/java/fr/themode/minestom/entity/pathfinding/EntityPathFinder.java → src/main/java/net/minestom/server/entity/pathfinding/EntityPathFinder.java
View File

@ -1,10 +1,10 @@
package fr.themode.minestom.entity.pathfinding;
package net.minestom.server.entity.pathfinding;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.entity.Entity;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.Position;
import fr.themode.minestom.utils.thread.MinestomThread;
import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.Entity;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.Position;
import net.minestom.server.utils.thread.MinestomThread;
import java.util.LinkedList;
import java.util.concurrent.ExecutorService;

10
src/main/java/fr/themode/minestom/entity/pathfinding/JPS.java → src/main/java/net/minestom/server/entity/pathfinding/JPS.java
View File

@ -1,9 +1,9 @@
package fr.themode.minestom.entity.pathfinding;
package net.minestom.server.entity.pathfinding;
import fr.themode.minestom.instance.Instance;
import fr.themode.minestom.instance.block.Block;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.Position;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.block.Block;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.Position;
import java.util.ArrayList;

2
src/main/java/fr/themode/minestom/entity/property/Attribute.java → src/main/java/net/minestom/server/entity/property/Attribute.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.entity.property;
package net.minestom.server.entity.property;
public enum Attribute {

4
src/main/java/fr/themode/minestom/entity/task/EntityTask.java → src/main/java/net/minestom/server/entity/task/EntityTask.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.entity.task;
package net.minestom.server.entity.task;
import fr.themode.minestom.entity.LivingEntity;
import net.minestom.server.entity.LivingEntity;
public abstract class EntityTask {

2
src/main/java/fr/themode/minestom/entity/vehicle/PlayerVehicleInformation.java → src/main/java/net/minestom/server/entity/vehicle/PlayerVehicleInformation.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.entity.vehicle;
package net.minestom.server.entity.vehicle;
public class PlayerVehicleInformation {

4
src/main/java/fr/themode/minestom/event/AnimationEvent.java → src/main/java/net/minestom/server/event/AnimationEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.entity.Player;
import net.minestom.server.entity.Player;
public class AnimationEvent extends CancellableEvent {

2
src/main/java/fr/themode/minestom/event/ArmAnimationEvent.java → src/main/java/net/minestom/server/event/ArmAnimationEvent.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public class ArmAnimationEvent extends CancellableEvent {

4
src/main/java/fr/themode/minestom/event/ArmorEquipEvent.java → src/main/java/net/minestom/server/event/ArmorEquipEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.item.ItemStack;
import net.minestom.server.item.ItemStack;
public class ArmorEquipEvent extends Event {

4
src/main/java/fr/themode/minestom/event/AttackEvent.java → src/main/java/net/minestom/server/event/AttackEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.entity.Entity;
import net.minestom.server.entity.Entity;
public class AttackEvent extends Event {

2
src/main/java/fr/themode/minestom/event/Callback.java → src/main/java/net/minestom/server/event/Callback.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public interface Callback<E extends Event> {

2
src/main/java/fr/themode/minestom/event/CancellableEvent.java → src/main/java/net/minestom/server/event/CancellableEvent.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public class CancellableEvent extends Event {

2
src/main/java/fr/themode/minestom/event/DeathEvent.java → src/main/java/net/minestom/server/event/DeathEvent.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public class DeathEvent extends Event {

5
src/main/java/net/minestom/server/event/Event.java Normal file
View File

@ -0,0 +1,5 @@
package net.minestom.server.event;
public class Event {
}

4
src/main/java/fr/themode/minestom/event/ItemDropEvent.java → src/main/java/net/minestom/server/event/ItemDropEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.item.ItemStack;
import net.minestom.server.item.ItemStack;
public class ItemDropEvent extends CancellableEvent {

2
src/main/java/fr/themode/minestom/event/PickupExperienceEvent.java → src/main/java/net/minestom/server/event/PickupExperienceEvent.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public class PickupExperienceEvent extends CancellableEvent {

4
src/main/java/fr/themode/minestom/event/PickupItemEvent.java → src/main/java/net/minestom/server/event/PickupItemEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.item.ItemStack;
import net.minestom.server.item.ItemStack;
public class PickupItemEvent extends CancellableEvent {

4
src/main/java/fr/themode/minestom/event/PlayerBlockBreakEvent.java → src/main/java/net/minestom/server/event/PlayerBlockBreakEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.utils.BlockPosition;
import net.minestom.server.utils.BlockPosition;
public class PlayerBlockBreakEvent extends CancellableEvent {

6
src/main/java/fr/themode/minestom/event/PlayerBlockInteractEvent.java → src/main/java/net/minestom/server/event/PlayerBlockInteractEvent.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.utils.BlockPosition;
import net.minestom.server.entity.Player;
import net.minestom.server.utils.BlockPosition;
public class PlayerBlockInteractEvent extends CancellableEvent {

6
src/main/java/fr/themode/minestom/event/PlayerBlockPlaceEvent.java → src/main/java/net/minestom/server/event/PlayerBlockPlaceEvent.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.utils.BlockPosition;
import net.minestom.server.entity.Player;
import net.minestom.server.utils.BlockPosition;
public class PlayerBlockPlaceEvent extends CancellableEvent {

4
src/main/java/fr/themode/minestom/event/PlayerChatEvent.java → src/main/java/net/minestom/server/event/PlayerChatEvent.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import club.thectm.minecraft.text.TextObject;
import fr.themode.minestom.entity.Player;
import net.minestom.server.entity.Player;
import java.util.ArrayList;
import java.util.Collection;

4
src/main/java/fr/themode/minestom/event/PlayerCommandEvent.java → src/main/java/net/minestom/server/event/PlayerCommandEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.entity.Player;
import net.minestom.server.entity.Player;
public class PlayerCommandEvent extends CancellableEvent {

2
src/main/java/fr/themode/minestom/event/PlayerDisconnectEvent.java → src/main/java/net/minestom/server/event/PlayerDisconnectEvent.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public class PlayerDisconnectEvent extends Event {
}

6
src/main/java/fr/themode/minestom/event/PlayerInteractEvent.java → src/main/java/net/minestom/server/event/PlayerInteractEvent.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.entity.Entity;
import fr.themode.minestom.entity.Player;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.Player;
public class PlayerInteractEvent extends Event {

4
src/main/java/fr/themode/minestom/event/PlayerLoginEvent.java → src/main/java/net/minestom/server/event/PlayerLoginEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.instance.Instance;
import net.minestom.server.instance.Instance;
public class PlayerLoginEvent extends Event {

4
src/main/java/fr/themode/minestom/event/PlayerMoveEvent.java → src/main/java/net/minestom/server/event/PlayerMoveEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.utils.Position;
import net.minestom.server.utils.Position;
public class PlayerMoveEvent extends CancellableEvent {

2
src/main/java/fr/themode/minestom/event/PlayerPluginMessageEvent.java → src/main/java/net/minestom/server/event/PlayerPluginMessageEvent.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public class PlayerPluginMessageEvent extends Event {

4
src/main/java/fr/themode/minestom/event/PlayerRespawnEvent.java → src/main/java/net/minestom/server/event/PlayerRespawnEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.utils.Position;
import net.minestom.server.utils.Position;
public class PlayerRespawnEvent extends Event {

4
src/main/java/fr/themode/minestom/event/PlayerSpawnEvent.java → src/main/java/net/minestom/server/event/PlayerSpawnEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.instance.Instance;
import net.minestom.server.instance.Instance;
public class PlayerSpawnEvent extends Event {

6
src/main/java/fr/themode/minestom/event/PlayerStartDiggingEvent.java → src/main/java/net/minestom/server/event/PlayerStartDiggingEvent.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.utils.BlockPosition;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.utils.BlockPosition;
public class PlayerStartDiggingEvent extends CancellableEvent {

4
src/main/java/fr/themode/minestom/event/PlayerSwapItemEvent.java → src/main/java/net/minestom/server/event/PlayerSwapItemEvent.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.item.ItemStack;
import net.minestom.server.item.ItemStack;
public class PlayerSwapItemEvent extends CancellableEvent {

2
src/main/java/fr/themode/minestom/event/PlayerTickEvent.java → src/main/java/net/minestom/server/event/PlayerTickEvent.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
public class PlayerTickEvent extends Event {
}

6
src/main/java/fr/themode/minestom/event/PlayerUseItemEvent.java → src/main/java/net/minestom/server/event/PlayerUseItemEvent.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.event;
package net.minestom.server.event;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.item.ItemStack;
import net.minestom.server.entity.Player;
import net.minestom.server.item.ItemStack;
public class PlayerUseItemEvent extends CancellableEvent {

2
src/main/java/fr/themode/minestom/instance/Biome.java → src/main/java/net/minestom/server/instance/Biome.java
View File

@ -1,4 +1,4 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import java.util.Arrays;

16
src/main/java/fr/themode/minestom/instance/BlockModifier.java → src/main/java/net/minestom/server/instance/BlockModifier.java
View File

@ -1,12 +1,12 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.instance.block.Block;
import fr.themode.minestom.instance.block.BlockManager;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.Position;
import net.minestom.server.MinecraftServer;
import net.minestom.server.data.Data;
import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.block.BlockManager;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.Position;
public interface BlockModifier {

30
src/main/java/fr/themode/minestom/instance/Chunk.java → src/main/java/net/minestom/server/instance/Chunk.java
View File

@ -1,21 +1,21 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.Viewable;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.instance.block.Block;
import fr.themode.minestom.instance.block.BlockManager;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.instance.block.UpdateConsumer;
import fr.themode.minestom.net.packet.server.play.ChunkDataPacket;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.PacketUtils;
import fr.themode.minestom.utils.SerializerUtils;
import fr.themode.minestom.utils.time.CooldownUtils;
import fr.themode.minestom.utils.time.UpdateOption;
import io.netty.buffer.ByteBuf;
import it.unimi.dsi.fastutil.ints.*;
import net.minestom.server.MinecraftServer;
import net.minestom.server.Viewable;
import net.minestom.server.data.Data;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.block.BlockManager;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.instance.block.UpdateConsumer;
import net.minestom.server.network.packet.server.play.ChunkDataPacket;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.PacketUtils;
import net.minestom.server.utils.SerializerUtils;
import net.minestom.server.utils.time.CooldownUtils;
import net.minestom.server.utils.time.UpdateOption;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;

4
src/main/java/fr/themode/minestom/instance/ChunkGenerator.java → src/main/java/net/minestom/server/instance/ChunkGenerator.java
View File

@ -1,6 +1,6 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.instance.batch.ChunkBatch;
import net.minestom.server.instance.batch.ChunkBatch;
public abstract class ChunkGenerator {

8
src/main/java/fr/themode/minestom/instance/ChunkLoaderIO.java → src/main/java/net/minestom/server/instance/ChunkLoaderIO.java
View File

@ -1,8 +1,8 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.io.ChunkReader;
import fr.themode.minestom.io.IOManager;
import fr.themode.minestom.utils.CompressionUtils;
import net.minestom.server.io.ChunkReader;
import net.minestom.server.io.IOManager;
import net.minestom.server.utils.CompressionUtils;
import java.io.File;
import java.io.FileNotFoundException;

32
src/main/java/fr/themode/minestom/instance/Instance.java → src/main/java/net/minestom/server/instance/Instance.java
View File

@ -1,21 +1,21 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.data.DataContainer;
import fr.themode.minestom.entity.*;
import fr.themode.minestom.instance.batch.BlockBatch;
import fr.themode.minestom.instance.batch.ChunkBatch;
import fr.themode.minestom.instance.block.Block;
import fr.themode.minestom.instance.block.BlockManager;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.net.PacketWriterUtils;
import fr.themode.minestom.net.packet.server.play.BlockActionPacket;
import fr.themode.minestom.net.packet.server.play.ChunkDataPacket;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.ChunkUtils;
import fr.themode.minestom.utils.Position;
import io.netty.buffer.ByteBuf;
import net.minestom.server.MinecraftServer;
import net.minestom.server.data.Data;
import net.minestom.server.data.DataContainer;
import net.minestom.server.entity.*;
import net.minestom.server.instance.batch.BlockBatch;
import net.minestom.server.instance.batch.ChunkBatch;
import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.block.BlockManager;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.network.PacketWriterUtils;
import net.minestom.server.network.packet.server.play.BlockActionPacket;
import net.minestom.server.network.packet.server.play.ChunkDataPacket;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.ChunkUtils;
import net.minestom.server.utils.Position;
import java.io.File;
import java.util.*;

34
src/main/java/fr/themode/minestom/instance/InstanceContainer.java → src/main/java/net/minestom/server/instance/InstanceContainer.java
View File

@ -1,22 +1,22 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.event.PlayerBlockBreakEvent;
import fr.themode.minestom.instance.batch.BlockBatch;
import fr.themode.minestom.instance.batch.ChunkBatch;
import fr.themode.minestom.instance.block.CustomBlock;
import fr.themode.minestom.instance.block.rule.BlockPlacementRule;
import fr.themode.minestom.net.PacketWriterUtils;
import fr.themode.minestom.net.packet.server.play.BlockChangePacket;
import fr.themode.minestom.net.packet.server.play.ParticlePacket;
import fr.themode.minestom.net.packet.server.play.UnloadChunkPacket;
import fr.themode.minestom.particle.Particle;
import fr.themode.minestom.particle.ParticleCreator;
import fr.themode.minestom.utils.BlockPosition;
import fr.themode.minestom.utils.ChunkUtils;
import fr.themode.minestom.utils.SerializerUtils;
import io.netty.buffer.ByteBuf;
import net.minestom.server.data.Data;
import net.minestom.server.entity.Player;
import net.minestom.server.event.PlayerBlockBreakEvent;
import net.minestom.server.instance.batch.BlockBatch;
import net.minestom.server.instance.batch.ChunkBatch;
import net.minestom.server.instance.block.CustomBlock;
import net.minestom.server.instance.block.rule.BlockPlacementRule;
import net.minestom.server.network.PacketWriterUtils;
import net.minestom.server.network.packet.server.play.BlockChangePacket;
import net.minestom.server.network.packet.server.play.ParticlePacket;
import net.minestom.server.network.packet.server.play.UnloadChunkPacket;
import net.minestom.server.particle.Particle;
import net.minestom.server.particle.ParticleCreator;
import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.ChunkUtils;
import net.minestom.server.utils.SerializerUtils;
import java.io.File;
import java.util.*;

6
src/main/java/fr/themode/minestom/instance/InstanceManager.java → src/main/java/net/minestom/server/instance/InstanceManager.java
View File

@ -1,7 +1,7 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.MinecraftServer;
import fr.themode.minestom.utils.thread.MinestomThread;
import net.minestom.server.MinecraftServer;
import net.minestom.server.utils.thread.MinestomThread;
import java.io.File;
import java.util.Collections;

12
src/main/java/fr/themode/minestom/instance/SharedInstance.java → src/main/java/net/minestom/server/instance/SharedInstance.java
View File

@ -1,10 +1,10 @@
package fr.themode.minestom.instance;
package net.minestom.server.instance;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.entity.Player;
import fr.themode.minestom.instance.batch.BlockBatch;
import fr.themode.minestom.instance.batch.ChunkBatch;
import fr.themode.minestom.utils.BlockPosition;
import net.minestom.server.data.Data;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.batch.BlockBatch;
import net.minestom.server.instance.batch.ChunkBatch;
import net.minestom.server.utils.BlockPosition;
import java.io.File;
import java.util.Collection;

10
src/main/java/fr/themode/minestom/instance/batch/BlockBatch.java → src/main/java/net/minestom/server/instance/batch/BlockBatch.java
View File

@ -1,9 +1,9 @@
package fr.themode.minestom.instance.batch;
package net.minestom.server.instance.batch;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.instance.Chunk;
import fr.themode.minestom.instance.InstanceContainer;
import fr.themode.minestom.utils.SerializerUtils;
import net.minestom.server.data.Data;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.InstanceContainer;
import net.minestom.server.utils.SerializerUtils;
import java.util.ArrayList;
import java.util.HashMap;

12
src/main/java/fr/themode/minestom/instance/batch/ChunkBatch.java → src/main/java/net/minestom/server/instance/batch/ChunkBatch.java
View File

@ -1,10 +1,10 @@
package fr.themode.minestom.instance.batch;
package net.minestom.server.instance.batch;
import fr.themode.minestom.data.Data;
import fr.themode.minestom.instance.Chunk;
import fr.themode.minestom.instance.ChunkGenerator;
import fr.themode.minestom.instance.InstanceContainer;
import fr.themode.minestom.utils.SerializerUtils;
import net.minestom.server.data.Data;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.ChunkGenerator;
import net.minestom.server.instance.InstanceContainer;
import net.minestom.server.utils.SerializerUtils;
import java.util.ArrayList;
import java.util.Collections;

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