From 5fcad6628267eece7e3f35f147779e0f7a1a2e99 Mon Sep 17 00:00:00 2001 From: Aaron Date: Sat, 2 Sep 2023 19:19:02 +0200 Subject: [PATCH] chore: renamed to 'Sculk' and some other things --- .../server/command/BrigadierCommand.java | 35 ------ .../server => sculk}/MinecraftConfig.java | 2 +- .../server => sculk}/MinecraftServer.java | 28 ++--- .../{minecraft/server => sculk}/Viewable.java | 4 +- .../command/CommandHandler.java | 7 +- .../command/CommandSource.java | 2 +- .../connection/Connection.java | 2 +- .../container/AnvilContainer.java | 2 +- .../container/BeaconContainer.java | 4 +- .../container/BrewingStandContainer.java | 2 +- .../server => sculk}/container/Container.java | 4 +- .../container/EnchantmentTableContainer.java | 4 +- .../container/FurnaceContainer.java | 2 +- .../server => sculk}/container/Inventory.java | 4 +- .../container/LecternContainer.java | 2 +- .../container/LoomContainer.java | 2 +- .../container/StonecutterContainer.java | 2 +- .../container/item/ItemStack.java | 2 +- .../container/item/Material.java | 2 +- .../server => sculk}/damage/DamageType.java | 4 +- .../enchantment/Enchantment.java | 2 +- .../server => sculk}/entity/Ageable.java | 2 +- .../server => sculk}/entity/Allay.java | 2 +- .../server => sculk}/entity/Animal.java | 2 +- .../entity/AreaEffectCloud.java | 2 +- .../server => sculk}/entity/ArmorStand.java | 2 +- .../server => sculk}/entity/Arrow.java | 2 +- .../server => sculk}/entity/Axolotl.java | 2 +- .../server => sculk}/entity/Bat.java | 2 +- .../server => sculk}/entity/Bee.java | 2 +- .../server => sculk}/entity/Blaze.java | 2 +- .../server => sculk}/entity/BlockDisplay.java | 2 +- .../server => sculk}/entity/Boat.java | 2 +- .../server => sculk}/entity/Camel.java | 2 +- .../server => sculk}/entity/Cat.java | 2 +- .../server => sculk}/entity/CaveSpider.java | 2 +- .../server => sculk}/entity/ChestBoat.java | 2 +- .../entity/ChestMinecart.java | 2 +- .../server => sculk}/entity/Chicken.java | 2 +- .../server => sculk}/entity/Cod.java | 2 +- .../entity/CommandBlockMinecart.java | 2 +- .../server => sculk}/entity/Cow.java | 2 +- .../server => sculk}/entity/Creeper.java | 2 +- .../server => sculk}/entity/Display.java | 2 +- .../server => sculk}/entity/Dolphin.java | 2 +- .../server => sculk}/entity/Donkey.java | 2 +- .../entity/DragonFireball.java | 2 +- .../server => sculk}/entity/Drowned.java | 2 +- .../server => sculk}/entity/Egg.java | 2 +- .../entity/ElderGuardian.java | 2 +- .../server => sculk}/entity/EndCrystal.java | 2 +- .../server => sculk}/entity/EnderDragon.java | 2 +- .../server => sculk}/entity/EnderPearl.java | 2 +- .../server => sculk}/entity/Enderman.java | 2 +- .../server => sculk}/entity/Endermite.java | 2 +- .../server => sculk}/entity/Entity.java | 8 +- .../server => sculk}/entity/EntityType.java | 2 +- .../server => sculk}/entity/Evoker.java | 2 +- .../server => sculk}/entity/EvokerFangs.java | 2 +- .../entity/ExperienceBottle.java | 2 +- .../entity/ExperienceOrb.java | 2 +- .../server => sculk}/entity/EyeOfEnder.java | 2 +- .../server => sculk}/entity/FallingBlock.java | 2 +- .../server => sculk}/entity/Fireball.java | 2 +- .../entity/FireworkRocket.java | 2 +- .../entity/FishingBobber.java | 2 +- .../server => sculk}/entity/Fox.java | 2 +- .../server => sculk}/entity/Frog.java | 2 +- .../entity/FurnaceMinecart.java | 2 +- .../server => sculk}/entity/Ghast.java | 2 +- .../server => sculk}/entity/Giant.java | 2 +- .../entity/GlowItemFrame.java | 2 +- .../server => sculk}/entity/GlowSquid.java | 2 +- .../server => sculk}/entity/Goat.java | 2 +- .../server => sculk}/entity/Guardian.java | 2 +- .../server => sculk}/entity/Hoglin.java | 2 +- .../entity/HopperMinecart.java | 2 +- .../server => sculk}/entity/Horse.java | 2 +- .../server => sculk}/entity/Husk.java | 2 +- .../server => sculk}/entity/Illusioner.java | 2 +- .../server => sculk}/entity/Interaction.java | 2 +- .../server => sculk}/entity/IronGolem.java | 2 +- .../server => sculk}/entity/Item.java | 2 +- .../server => sculk}/entity/ItemDisplay.java | 2 +- .../server => sculk}/entity/ItemFrame.java | 2 +- .../server => sculk}/entity/LeashKnot.java | 2 +- .../entity/LightningBolt.java | 2 +- .../server => sculk}/entity/LivingEntity.java | 2 +- .../server => sculk}/entity/Llama.java | 2 +- .../server => sculk}/entity/LlamaSpit.java | 2 +- .../server => sculk}/entity/MagmaCube.java | 2 +- .../server => sculk}/entity/Minecart.java | 2 +- .../server => sculk}/entity/Mob.java | 2 +- .../server => sculk}/entity/Monster.java | 2 +- .../server => sculk}/entity/Mooshroom.java | 2 +- .../server => sculk}/entity/Mule.java | 2 +- .../server => sculk}/entity/Ocelot.java | 2 +- .../server => sculk}/entity/Painting.java | 2 +- .../server => sculk}/entity/Panda.java | 2 +- .../server => sculk}/entity/Parrot.java | 2 +- .../server => sculk}/entity/Phantom.java | 2 +- .../server => sculk}/entity/Pig.java | 2 +- .../server => sculk}/entity/Piglin.java | 2 +- .../server => sculk}/entity/PiglinBrute.java | 2 +- .../server => sculk}/entity/Pillager.java | 2 +- .../server => sculk}/entity/PolarBear.java | 2 +- .../server => sculk}/entity/Potion.java | 2 +- .../server => sculk}/entity/Projectile.java | 2 +- .../server => sculk}/entity/Pufferfish.java | 2 +- .../server => sculk}/entity/Rabbit.java | 2 +- .../server => sculk}/entity/Ravager.java | 2 +- .../server => sculk}/entity/Salmon.java | 2 +- .../server => sculk}/entity/Sheep.java | 2 +- .../server => sculk}/entity/Shulker.java | 2 +- .../entity/ShulkerBullet.java | 2 +- .../server => sculk}/entity/Silverfish.java | 2 +- .../server => sculk}/entity/Skeleton.java | 2 +- .../entity/SkeletonHorse.java | 2 +- .../server => sculk}/entity/Slime.java | 2 +- .../entity/SmallFireball.java | 2 +- .../server => sculk}/entity/Sniffer.java | 2 +- .../server => sculk}/entity/SnowGolem.java | 2 +- .../server => sculk}/entity/Snowball.java | 2 +- .../entity/SpawnerMinecart.java | 2 +- .../entity/SpectralArrow.java | 2 +- .../server => sculk}/entity/Spider.java | 2 +- .../server => sculk}/entity/Squid.java | 2 +- .../server => sculk}/entity/Stray.java | 2 +- .../server => sculk}/entity/Strider.java | 2 +- .../server => sculk}/entity/Tadpole.java | 2 +- .../server => sculk}/entity/Tameable.java | 2 +- .../server => sculk}/entity/TextDisplay.java | 2 +- .../server => sculk}/entity/Tnt.java | 2 +- .../server => sculk}/entity/TntMinecart.java | 2 +- .../server => sculk}/entity/TraderLlama.java | 2 +- .../server => sculk}/entity/Trident.java | 2 +- .../server => sculk}/entity/TropicalFish.java | 2 +- .../server => sculk}/entity/Turtle.java | 2 +- .../server => sculk}/entity/Vex.java | 2 +- .../server => sculk}/entity/Villager.java | 2 +- .../server => sculk}/entity/Vindicator.java | 2 +- .../entity/WanderingTrader.java | 2 +- .../server => sculk}/entity/Warden.java | 2 +- .../server => sculk}/entity/Witch.java | 2 +- .../server => sculk}/entity/Wither.java | 2 +- .../entity/WitherSkeleton.java | 2 +- .../server => sculk}/entity/WitherSkull.java | 2 +- .../server => sculk}/entity/Wolf.java | 2 +- .../server => sculk}/entity/Zoglin.java | 2 +- .../server => sculk}/entity/Zombie.java | 2 +- .../server => sculk}/entity/ZombieHorse.java | 2 +- .../entity/ZombieVillager.java | 2 +- .../entity/ZombifiedPiglin.java | 2 +- .../entity/player/GameMode.java | 2 +- .../entity/player/GameProfile.java | 2 +- .../entity/player/Player.java | 12 +- .../entity/player/PlayerInfoEntry.java | 2 +- .../entity/player/PlayerSettings.java | 2 +- .../server => sculk}/event/EventHandler.java | 4 +- .../server => sculk}/event/EventOrder.java | 2 +- .../server => sculk}/event/ResultedEvent.java | 2 +- .../server => sculk}/event/Subscribe.java | 2 +- .../event/block/BlockBreakEvent.java | 10 +- .../event/block/BlockPlaceEvent.java | 10 +- .../event/command/CommandExecuteEvent.java | 6 +- .../event/connection/ServerPingEvent.java | 4 +- .../lifecycle/ServerInitializeEvent.java | 2 +- .../event/lifecycle/ServerShutdownEvent.java | 2 +- .../event/player/PlayerChatEvent.java | 6 +- .../PlayerClickContainerButtonEvent.java | 6 +- .../player/PlayerClickContainerEvent.java | 10 +- .../event/player/PlayerInitialEvent.java | 12 +- .../event/player/PlayerJoinEvent.java | 4 +- .../event/player/PlayerUseItemEvent.java | 8 +- .../server => sculk}/plugin/Plugin.java | 4 +- .../plugin/PluginAnnotationProcessor.java | 4 +- .../plugin/PluginDescription.java | 2 +- .../plugin/PluginHandler.java | 2 +- .../server => sculk}/potion/PotionEffect.java | 2 +- .../server => sculk}/registry/Registry.java | 2 +- .../server => sculk}/world/Position.java | 2 +- .../server => sculk}/world/World.java | 18 +-- .../server => sculk}/world/biome/Biome.java | 4 +- .../server => sculk}/world/block/Block.java | 2 +- .../world/block/BlockState.java | 2 +- .../server => sculk}/world/block/Blocks.java | 2 +- .../server => sculk}/world/chunk/Chunk.java | 6 +- .../world/chunk/ChunkGenerator.java | 2 +- .../world/chunk/VoidGenerator.java | 2 +- .../world/dimension/Dimension.java | 6 +- .../javax.annotation.processing.Processor | 2 +- build.gradle.kts | 4 +- .../code/generator/CodeGenerator.java | 26 ++-- .../sculk/code/generator/DataGenerator.java | 42 +++++++ gradle/libs.versions.toml | 9 +- gradle/wrapper/gradle-wrapper.jar | Bin 61608 -> 62076 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 19 +-- gradlew.bat | 1 + .../terminal/TerminalAppender.java | 2 +- server/build.gradle.kts | 16 ++- .../server/command/defaults/InfoCommand.java | 37 ------ .../command/defaults/ShutdownCommand.java | 18 --- .../netty/NettyServerInitializer.java | 32 ----- .../protocol/netty/codec/CipherDecoder.java | 19 --- .../protocol/netty/codec/CipherEncoder.java | 21 ---- .../netty/codec/CompressorDecoder.java | 48 ------- .../netty/codec/CompressorEncoder.java | 63 ---------- .../protocol/netty/codec/JavaCipher.java | 34 ----- .../netty/codec/MinecraftDecoder.java | 74 ----------- .../netty/codec/MinecraftEncoder.java | 37 ------ .../netty/codec/VarIntFrameDecoder.java | 39 ------ .../netty/codec/VarIntLengthEncoder.java | 29 ----- .../protocol/packet/play/UpdateRecipes.java | 12 -- .../protocol/packet/play/UpdateTags.java | 12 -- .../world/chunk/loader/ChunkLoader.java | 13 -- .../{minecraft/server => sculk}/Main.java | 4 +- .../SculkConfiguration.java} | 6 +- .../SculkMinecraftServer.java} | 102 ++++++++------- .../adventure/AdventureLoggerProvider.java | 2 +- .../command/MineCommandHandler.java | 24 ++-- .../sculk/command/defaults/InfoCommand.java | 41 ++++++ .../command/defaults/ShutdownCommand.java | 20 +++ .../container/GenericContainer.java | 4 +- .../container/MineAnvilContainer.java | 4 +- .../container/MineBeaconContainer.java | 6 +- .../container/MineBrewingStandContainer.java | 4 +- .../container/MineContainer.java | 16 +-- .../MineEnchantingTableContainer.java | 6 +- .../container/MineFurnaceContainer.java | 4 +- .../container/MineInventory.java | 12 +- .../container/MineLecternContainer.java | 4 +- .../container/MineLoomContainer.java | 4 +- .../container/MineStonecutterContainer.java | 4 +- .../entity/AbstractAnimal.java | 2 +- .../entity/AbstractEntity.java | 24 ++-- .../entity/AbstractLivingEntity.java | 2 +- .../server => sculk}/entity/AbstractMob.java | 2 +- .../entity/AbstractTameableAnimal.java | 2 +- .../entity/EntityClassToSupplierMap.java | 2 +- .../server => sculk}/entity/Metadata.java | 8 +- .../server => sculk}/entity/MineAllay.java | 2 +- .../entity/MineAreaEffectCloud.java | 2 +- .../entity/MineArmorStand.java | 2 +- .../server => sculk}/entity/MineArrow.java | 2 +- .../server => sculk}/entity/MineAxolotl.java | 2 +- .../server => sculk}/entity/MineBat.java | 2 +- .../server => sculk}/entity/MineBee.java | 2 +- .../server => sculk}/entity/MineBlaze.java | 2 +- .../entity/MineBlockDisplay.java | 2 +- .../server => sculk}/entity/MineBoat.java | 2 +- .../server => sculk}/entity/MineCamel.java | 2 +- .../server => sculk}/entity/MineCat.java | 2 +- .../entity/MineCaveSpider.java | 2 +- .../entity/MineChestBoat.java | 2 +- .../entity/MineChestMinecart.java | 2 +- .../server => sculk}/entity/MineChicken.java | 2 +- .../server => sculk}/entity/MineCod.java | 2 +- .../entity/MineCommandBlockMinecart.java | 2 +- .../server => sculk}/entity/MineCow.java | 2 +- .../server => sculk}/entity/MineCreeper.java | 2 +- .../server => sculk}/entity/MineDolphin.java | 2 +- .../server => sculk}/entity/MineDonkey.java | 2 +- .../entity/MineDragonFireball.java | 2 +- .../server => sculk}/entity/MineDrowned.java | 2 +- .../server => sculk}/entity/MineEgg.java | 2 +- .../entity/MineElderGuardian.java | 2 +- .../entity/MineEndCrystal.java | 2 +- .../entity/MineEnderDragon.java | 2 +- .../entity/MineEnderPearl.java | 2 +- .../server => sculk}/entity/MineEnderman.java | 2 +- .../entity/MineEndermite.java | 2 +- .../server => sculk}/entity/MineEvoker.java | 2 +- .../entity/MineEvokerFangs.java | 2 +- .../entity/MineExperienceBottle.java | 2 +- .../entity/MineExperienceOrb.java | 2 +- .../entity/MineEyeOfEnder.java | 2 +- .../entity/MineFallingBlock.java | 2 +- .../server => sculk}/entity/MineFireball.java | 2 +- .../entity/MineFireworkRocket.java | 2 +- .../entity/MineFishingBobber.java | 2 +- .../server => sculk}/entity/MineFox.java | 2 +- .../server => sculk}/entity/MineFrog.java | 2 +- .../entity/MineFurnaceMinecart.java | 2 +- .../server => sculk}/entity/MineGhast.java | 2 +- .../server => sculk}/entity/MineGiant.java | 2 +- .../entity/MineGlowItemFrame.java | 2 +- .../entity/MineGlowSquid.java | 2 +- .../server => sculk}/entity/MineGoat.java | 2 +- .../server => sculk}/entity/MineGuardian.java | 2 +- .../server => sculk}/entity/MineHoglin.java | 2 +- .../entity/MineHopperMinecart.java | 2 +- .../server => sculk}/entity/MineHorse.java | 2 +- .../server => sculk}/entity/MineHusk.java | 2 +- .../entity/MineIllusioner.java | 2 +- .../entity/MineInteraction.java | 2 +- .../entity/MineIronGolem.java | 2 +- .../server => sculk}/entity/MineItem.java | 2 +- .../entity/MineItemDisplay.java | 2 +- .../entity/MineItemFrame.java | 2 +- .../server => sculk}/entity/MineLLama.java | 2 +- .../entity/MineLeashKnot.java | 2 +- .../entity/MineLightningBolt.java | 2 +- .../entity/MineLlamaSpit.java | 2 +- .../entity/MineMagmaCube.java | 2 +- .../server => sculk}/entity/MineMinecart.java | 2 +- .../entity/MineMooshroom.java | 2 +- .../server => sculk}/entity/MineMule.java | 2 +- .../server => sculk}/entity/MineOcelot.java | 2 +- .../server => sculk}/entity/MinePainting.java | 2 +- .../server => sculk}/entity/MinePanda.java | 2 +- .../server => sculk}/entity/MineParrot.java | 2 +- .../server => sculk}/entity/MinePhantom.java | 2 +- .../server => sculk}/entity/MinePig.java | 2 +- .../server => sculk}/entity/MinePiglin.java | 2 +- .../entity/MinePiglinBrute.java | 2 +- .../server => sculk}/entity/MinePillager.java | 2 +- .../entity/MinePolarBear.java | 2 +- .../server => sculk}/entity/MinePotion.java | 2 +- .../entity/MinePufferfish.java | 2 +- .../server => sculk}/entity/MineRabbit.java | 2 +- .../server => sculk}/entity/MineRavager.java | 2 +- .../server => sculk}/entity/MineSalmon.java | 2 +- .../server => sculk}/entity/MineSheep.java | 2 +- .../server => sculk}/entity/MineShulker.java | 2 +- .../entity/MineSilverfish.java | 2 +- .../server => sculk}/entity/MineSkeleton.java | 2 +- .../entity/MineSkeletonHorse.java | 2 +- .../entity/MineSkulkerBullet.java | 2 +- .../server => sculk}/entity/MineSlime.java | 2 +- .../entity/MineSmallFireball.java | 2 +- .../server => sculk}/entity/MineSniffer.java | 2 +- .../entity/MineSnowGolem.java | 2 +- .../server => sculk}/entity/MineSnowball.java | 2 +- .../entity/MineSpawnerMinecart.java | 2 +- .../entity/MineSpectralArrow.java | 2 +- .../server => sculk}/entity/MineSpider.java | 2 +- .../server => sculk}/entity/MineSquid.java | 2 +- .../server => sculk}/entity/MineStray.java | 2 +- .../server => sculk}/entity/MineStrider.java | 2 +- .../server => sculk}/entity/MineTadpole.java | 2 +- .../entity/MineTextDisplay.java | 2 +- .../server => sculk}/entity/MineTnt.java | 2 +- .../entity/MineTntMinecart.java | 2 +- .../entity/MineTraderLlama.java | 2 +- .../server => sculk}/entity/MineTrident.java | 2 +- .../entity/MineTropicalFish.java | 2 +- .../server => sculk}/entity/MineTurtle.java | 2 +- .../server => sculk}/entity/MineVex.java | 2 +- .../server => sculk}/entity/MineVillager.java | 2 +- .../entity/MineVindicator.java | 2 +- .../entity/MineWanderingTrader.java | 2 +- .../server => sculk}/entity/MineWarden.java | 2 +- .../server => sculk}/entity/MineWitch.java | 2 +- .../entity/MineWitherSkeleton.java | 2 +- .../entity/MineWitherSkull.java | 2 +- .../server => sculk}/entity/MineWolf.java | 2 +- .../server => sculk}/entity/MineZoglin.java | 2 +- .../server => sculk}/entity/MineZombie.java | 2 +- .../entity/MineZombieHorse.java | 2 +- .../entity/MineZombieVillager.java | 2 +- .../entity/MineZombifiedPiglin.java | 2 +- .../player/ClientInformationWrapper.java | 4 +- .../entity/player/MinecraftPlayer.java | 44 +++---- .../event/EventThreadFactory.java | 2 +- .../event/MineEventHandler.java | 4 +- .../json/GameProfileDeserializer.java | 10 +- .../json/GameProfilePropertyDeserializer.java | 4 +- .../plugin/MinePluginHandler.java | 8 +- .../bauhd/sculk/plugin/PluginClassLoader.java | 51 ++++++++ .../server => sculk}/protocol/Buffer.java | 42 ++++--- .../protocol/MineConnection.java | 119 +++++++++--------- .../server => sculk}/protocol/Protocol.java | 2 +- .../server => sculk}/protocol/State.java | 50 ++++---- .../protocol/netty/NettyServer.java | 45 ++++--- .../netty/NettyServerInitializer.java | 35 ++++++ .../protocol/netty/codec/CipherDecoder.java | 35 ++++++ .../protocol/netty/codec/CipherEncoder.java | 35 ++++++ .../netty/codec/CompressorDecoder.java | 45 +++++++ .../netty/codec/CompressorEncoder.java | 62 +++++++++ .../netty/codec/MinecraftDecoder.java | 74 +++++++++++ .../netty/codec/MinecraftEncoder.java | 35 ++++++ .../netty/codec/VarIntFrameDecoder.java | 41 ++++++ .../netty/codec/VarIntLengthEncoder.java | 29 +++++ .../protocol/packet/Packet.java | 4 +- .../protocol/packet/PacketHandler.java | 34 ++--- .../protocol/packet/PacketUtils.java | 9 +- .../handler/HandshakePacketHandler.java | 14 +-- .../packet/handler/LoginPacketHandler.java | 20 +-- .../packet/handler/PlayPacketHandler.java | 58 ++++----- .../packet/handler/StatusPacketHandler.java | 24 ++-- .../protocol/packet/handshake/Handshake.java | 10 +- .../packet/login/CompressionPacket.java | 6 +- .../protocol/packet/login/Disconnect.java | 6 +- .../packet/login/EncryptionRequest.java | 6 +- .../packet/login/EncryptionResponse.java | 8 +- .../packet/login/LoginPluginRequest.java | 6 +- .../packet/login/LoginPluginResponse.java | 8 +- .../protocol/packet/login/LoginStart.java | 8 +- .../protocol/packet/login/LoginSuccess.java | 8 +- .../protocol/packet/play/ActionBar.java | 6 +- .../protocol/packet/play/AwardStatistics.java | 6 +- .../protocol/packet/play/BossBar.java | 6 +- .../protocol/packet/play/CenterChunk.java | 6 +- .../packet/play/ChangeDifficulty.java | 6 +- .../protocol/packet/play/ChatMessage.java | 10 +- .../packet/play/ChunkDataAndUpdateLight.java | 8 +- .../protocol/packet/play/ClientCommand.java | 8 +- .../packet/play/ClientInformation.java | 10 +- .../play/CommandSuggestionsRequest.java | 8 +- .../packet/play/ConfirmTeleportation.java | 6 +- .../protocol/packet/play/Cooldown.java | 6 +- .../packet/play/CreativeModeSlot.java | 10 +- .../protocol/packet/play/EditBook.java | 10 +- .../protocol/packet/play/EntityAnimation.java | 6 +- .../protocol/packet/play/EntityEvent.java | 6 +- .../protocol/packet/play/EntityMetadata.java | 8 +- .../protocol/packet/play/Equipment.java | 8 +- .../protocol/packet/play/Experience.java | 6 +- .../protocol/packet/play/FeatureFlags.java | 6 +- .../protocol/packet/play/GameEvent.java | 6 +- .../protocol/packet/play/Health.java | 6 +- .../protocol/packet/play/HeldItem.java | 8 +- .../protocol/packet/play/Interact.java | 8 +- .../protocol/packet/play/KeepAlive.java | 8 +- .../protocol/packet/play/Login.java | 14 +-- .../protocol/packet/play/PickupItem.java | 6 +- .../protocol/packet/play/PlayerAbilities.java | 6 +- .../protocol/packet/play/PlayerAction.java | 10 +- .../protocol/packet/play/PlayerCommand.java | 8 +- .../protocol/packet/play/PlayerInfo.java | 8 +- .../packet/play/PlayerInfoRemove.java | 8 +- .../protocol/packet/play/PlayerSession.java | 8 +- .../protocol/packet/play/PluginMessage.java | 8 +- .../packet/play/RecipeBookSettings.java | 6 +- .../protocol/packet/play/RemoveEntities.java | 6 +- .../protocol/packet/play/RenderDistance.java | 6 +- .../protocol/packet/play/Respawn.java | 8 +- .../packet/play/SimulationDistance.java | 6 +- .../protocol/packet/play/SpawnEntity.java | 8 +- .../packet/play/SpawnExperienceOrb.java | 6 +- .../protocol/packet/play/SpawnPlayer.java | 8 +- .../protocol/packet/play/SpawnPosition.java | 8 +- .../protocol/packet/play/SwingArm.java | 8 +- .../play/SynchronizePlayerPosition.java | 8 +- .../packet/play/SystemChatMessage.java | 6 +- .../packet/play/TabListHeaderFooter.java | 6 +- .../packet/play/TeleportToEntity.java | 6 +- .../packet/play/UpdateAttributes.java | 6 +- .../protocol/packet/play/UpdateRecipes.java | 12 ++ .../protocol/packet/play/UpdateTags.java | 12 ++ .../protocol/packet/play/UseItem.java | 8 +- .../protocol/packet/play/UseItemOn.java | 12 +- .../packet/play/block/BlockAction.java | 8 +- .../packet/play/block/BlockChange.java | 6 +- .../packet/play/block/BlockDestroyStage.java | 8 +- .../packet/play/block/BlockEntityData.java | 8 +- .../packet/play/block/BlockUpdate.java | 8 +- .../packet/play/command/ChatCommand.java | 8 +- .../command/CommandSuggestionsResponse.java | 6 +- .../packet/play/command/Commands.java | 8 +- .../packet/play/container/ClickContainer.java | 10 +- .../play/container/ClickContainerButton.java | 8 +- .../packet/play/container/CloseContainer.java | 8 +- .../play/container/ContainerContent.java | 8 +- .../play/container/ContainerProperty.java | 6 +- .../packet/play/container/ContainerSlot.java | 8 +- .../packet/play/container/OpenScreen.java | 6 +- .../packet/play/position/EntityPosition.java | 6 +- .../position/EntityPositionAndRotation.java | 6 +- .../packet/play/position/EntityRotation.java | 6 +- .../packet/play/position/HeadRotation.java | 6 +- .../packet/play/position/PlayerOnGround.java | 8 +- .../packet/play/position/PlayerPosition.java | 8 +- .../position/PlayerPositionAndRotation.java | 8 +- .../packet/play/position/PlayerRotation.java | 8 +- .../play/scoreboard/DisplayObjective.java | 6 +- .../play/scoreboard/UpdateObjectives.java | 6 +- .../packet/play/scoreboard/UpdateScore.java | 6 +- .../packet/play/title/ClearTitles.java | 6 +- .../protocol/packet/play/title/Subtitle.java | 6 +- .../protocol/packet/play/title/Title.java | 6 +- .../play/title/TitleAnimationTimes.java | 6 +- .../protocol/packet/status/StatusPing.java | 8 +- .../protocol/packet/status/StatusRequest.java | 6 +- .../packet/status/StatusResponse.java | 6 +- .../registry/SimpleRegistry.java | 2 +- .../terminal/SimpleTerminal.java | 13 +- .../util/BossBarListener.java | 12 +- .../server => sculk}/util/Constant.java | 2 +- .../server => sculk}/util/CoordinateUtil.java | 2 +- .../server => sculk}/util/EncryptionUtil.java | 2 +- .../server => sculk}/util/ItemList.java | 4 +- .../server => sculk}/util/MojangUtil.java | 8 +- .../server => sculk}/util/Utf8.java | 2 +- .../world/MinecraftWorld.java | 40 +++--- .../server => sculk}/world/Worker.java | 2 +- .../world/block/BlockParent.java | 2 +- .../world/block/MineBlockState.java | 2 +- .../world/chunk/LightData.java | 4 +- .../world/chunk/MinecraftChunk.java | 42 +++---- .../world/chunk/loader/AnvilLoader.java | 49 ++++---- .../sculk/world/chunk/loader/ChunkLoader.java | 13 ++ .../chunk/loader/DefaultChunkLoader.java | 8 +- .../world/dimension/DimensionRegistry.java | 4 +- .../world/section/DirectIndirectPalette.java | 4 +- .../world/section/EmptyPalette.java | 4 +- .../world/section/Palette.java | 4 +- .../world/section/PaletteHolder.java | 4 +- .../world/section/Section.java | 2 +- .../world/section/SingleValuedPalette.java | 4 +- ....text.logger.slf4j.ComponentLoggerProvider | 2 +- .../test/event/EventTest.java | 18 +-- .../test/plugin/TestPlugin.java | 6 +- settings.gradle.kts | 2 +- .../plugin/TestPlugin.java | 44 ++++--- .../plugin/command/GameModeCommand.java | 22 ++-- .../plugin/world/TestGenerator.java | 10 +- 518 files changed, 1893 insertions(+), 1810 deletions(-) delete mode 100644 api/src/main/java/de/bauhd/minecraft/server/command/BrigadierCommand.java rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/MinecraftConfig.java (89%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/MinecraftServer.java (85%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/Viewable.java (85%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/command/CommandHandler.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/command/CommandSource.java (85%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/connection/Connection.java (89%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/AnvilContainer.java (89%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/BeaconContainer.java (92%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/BrewingStandContainer.java (93%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/Container.java (94%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/EnchantmentTableContainer.java (97%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/FurnaceContainer.java (95%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/Inventory.java (86%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/LecternContainer.java (78%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/LoomContainer.java (79%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/StonecutterContainer.java (80%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/item/ItemStack.java (98%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/container/item/Material.java (99%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/damage/DamageType.java (99%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/enchantment/Enchantment.java (97%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Ageable.java (91%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Allay.java (63%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Animal.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/AreaEffectCloud.java (72%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ArmorStand.java (97%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Arrow.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Axolotl.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Bat.java (63%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Bee.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Blaze.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/BlockDisplay.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Boat.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Camel.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Cat.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/CaveSpider.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ChestBoat.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ChestMinecart.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Chicken.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Cod.java (63%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/CommandBlockMinecart.java (72%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Cow.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Creeper.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Display.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Dolphin.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Donkey.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/DragonFireball.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Drowned.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Egg.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ElderGuardian.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/EndCrystal.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/EnderDragon.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/EnderPearl.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Enderman.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Endermite.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Entity.java (89%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/EntityType.java (99%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Evoker.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/EvokerFangs.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ExperienceBottle.java (71%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ExperienceOrb.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/EyeOfEnder.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/FallingBlock.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Fireball.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/FireworkRocket.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/FishingBobber.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Fox.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Frog.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/FurnaceMinecart.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Ghast.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Giant.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/GlowItemFrame.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/GlowSquid.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Goat.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Guardian.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Hoglin.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/HopperMinecart.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Horse.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Husk.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Illusioner.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Interaction.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/IronGolem.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Item.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ItemDisplay.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ItemFrame.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/LeashKnot.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/LightningBolt.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/LivingEntity.java (97%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Llama.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/LlamaSpit.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MagmaCube.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Minecart.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Mob.java (83%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Monster.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Mooshroom.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Mule.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Ocelot.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Painting.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Panda.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Parrot.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Phantom.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Pig.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Piglin.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/PiglinBrute.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Pillager.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/PolarBear.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Potion.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Projectile.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Pufferfish.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Rabbit.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Ravager.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Salmon.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Sheep.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Shulker.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ShulkerBullet.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Silverfish.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Skeleton.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/SkeletonHorse.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Slime.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/SmallFireball.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Sniffer.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/SnowGolem.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Snowball.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/SpawnerMinecart.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/SpectralArrow.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Spider.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Squid.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Stray.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Strider.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Tadpole.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Tameable.java (94%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/TextDisplay.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Tnt.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/TntMinecart.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/TraderLlama.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Trident.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/TropicalFish.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Turtle.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Vex.java (63%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Villager.java (66%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Vindicator.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/WanderingTrader.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Warden.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Witch.java (64%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Wither.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/WitherSkeleton.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/WitherSkull.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Wolf.java (67%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Zoglin.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Zombie.java (65%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ZombieHorse.java (68%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ZombieVillager.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/ZombifiedPiglin.java (70%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/player/GameMode.java (76%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/player/GameProfile.java (93%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/player/Player.java (92%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/player/PlayerInfoEntry.java (94%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/player/PlayerSettings.java (96%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/EventHandler.java (96%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/EventOrder.java (87%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/ResultedEvent.java (96%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/Subscribe.java (90%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/block/BlockBreakEvent.java (74%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/block/BlockPlaceEvent.java (74%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/command/CommandExecuteEvent.java (80%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/connection/ServerPingEvent.java (94%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/lifecycle/ServerInitializeEvent.java (76%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/lifecycle/ServerShutdownEvent.java (69%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/player/PlayerChatEvent.java (80%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/player/PlayerClickContainerButtonEvent.java (81%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/player/PlayerClickContainerEvent.java (79%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/player/PlayerInitialEvent.java (81%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/player/PlayerJoinEvent.java (78%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/event/player/PlayerUseItemEvent.java (74%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/plugin/Plugin.java (91%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/plugin/PluginAnnotationProcessor.java (92%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/plugin/PluginDescription.java (87%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/plugin/PluginHandler.java (94%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/potion/PotionEffect.java (98%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/registry/Registry.java (97%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/Position.java (98%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/World.java (91%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/biome/Biome.java (98%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/block/Block.java (99%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/block/BlockState.java (98%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/block/Blocks.java (93%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/chunk/Chunk.java (88%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/chunk/ChunkGenerator.java (85%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/chunk/VoidGenerator.java (86%) rename api/src/main/java/de/bauhd/{minecraft/server => sculk}/world/dimension/Dimension.java (98%) rename code-generator/src/main/java/de/bauhd/{minecraft => sculk}/code/generator/CodeGenerator.java (91%) create mode 100644 code-generator/src/main/java/de/bauhd/sculk/code/generator/DataGenerator.java rename server/appender/src/main/java/de/bauhd/{minecraft/server => }/terminal/TerminalAppender.java (97%) delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/command/defaults/InfoCommand.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/command/defaults/ShutdownCommand.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/NettyServerInitializer.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherDecoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherEncoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorDecoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorEncoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/JavaCipher.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftDecoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftEncoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntFrameDecoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntLengthEncoder.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateRecipes.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateTags.java delete mode 100644 server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/ChunkLoader.java rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/Main.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server/MinecraftConfiguration.java => sculk/SculkConfiguration.java} (84%) rename server/src/main/java/de/bauhd/{minecraft/server/AdvancedMinecraftServer.java => sculk/SculkMinecraftServer.java} (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/adventure/AdventureLoggerProvider.java (94%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/command/MineCommandHandler.java (66%) create mode 100644 server/src/main/java/de/bauhd/sculk/command/defaults/InfoCommand.java create mode 100644 server/src/main/java/de/bauhd/sculk/command/defaults/ShutdownCommand.java rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/GenericContainer.java (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineAnvilContainer.java (87%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineBeaconContainer.java (91%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineBrewingStandContainer.java (91%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineContainer.java (77%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineEnchantingTableContainer.java (96%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineFurnaceContainer.java (94%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineInventory.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineLecternContainer.java (86%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineLoomContainer.java (87%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/container/MineStonecutterContainer.java (87%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/AbstractAnimal.java (92%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/AbstractEntity.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/AbstractLivingEntity.java (97%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/AbstractMob.java (81%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/AbstractTameableAnimal.java (93%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/EntityClassToSupplierMap.java (99%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/Metadata.java (97%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineAllay.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineAreaEffectCloud.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineArmorStand.java (97%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineArrow.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineAxolotl.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineBat.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineBee.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineBlaze.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineBlockDisplay.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineBoat.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineCamel.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineCat.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineCaveSpider.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineChestBoat.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineChestMinecart.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineChicken.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineCod.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineCommandBlockMinecart.java (86%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineCow.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineCreeper.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineDolphin.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineDonkey.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineDragonFireball.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineDrowned.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEgg.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineElderGuardian.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEndCrystal.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEnderDragon.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEnderPearl.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEnderman.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEndermite.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEvoker.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEvokerFangs.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineExperienceBottle.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineExperienceOrb.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineEyeOfEnder.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineFallingBlock.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineFireball.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineFireworkRocket.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineFishingBobber.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineFox.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineFrog.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineFurnaceMinecart.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineGhast.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineGiant.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineGlowItemFrame.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineGlowSquid.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineGoat.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineGuardian.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineHoglin.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineHopperMinecart.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineHorse.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineHusk.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineIllusioner.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineInteraction.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineIronGolem.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineItem.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineItemDisplay.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineItemFrame.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineLLama.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineLeashKnot.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineLightningBolt.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineLlamaSpit.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineMagmaCube.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineMinecart.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineMooshroom.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineMule.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineOcelot.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePainting.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePanda.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineParrot.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePhantom.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePig.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePiglin.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePiglinBrute.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePillager.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePolarBear.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePotion.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MinePufferfish.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineRabbit.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineRavager.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSalmon.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSheep.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineShulker.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSilverfish.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSkeleton.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSkeletonHorse.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSkulkerBullet.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSlime.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSmallFireball.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSniffer.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSnowGolem.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSnowball.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSpawnerMinecart.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSpectralArrow.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSpider.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineSquid.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineStray.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineStrider.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTadpole.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTextDisplay.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTnt.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTntMinecart.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTraderLlama.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTrident.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTropicalFish.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineTurtle.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineVex.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineVillager.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineVindicator.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineWanderingTrader.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineWarden.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineWitch.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineWitherSkeleton.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineWitherSkull.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineWolf.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineZoglin.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineZombie.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineZombieHorse.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineZombieVillager.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/MineZombifiedPiglin.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/player/ClientInformationWrapper.java (93%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/entity/player/MinecraftPlayer.java (88%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/event/EventThreadFactory.java (92%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/event/MineEventHandler.java (98%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/json/GameProfileDeserializer.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/json/GameProfilePropertyDeserializer.java (88%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/plugin/MinePluginHandler.java (93%) create mode 100644 server/src/main/java/de/bauhd/sculk/plugin/PluginClassLoader.java rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/Buffer.java (90%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/MineConnection.java (75%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/Protocol.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/State.java (88%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/netty/NettyServer.java (51%) create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/NettyServerInitializer.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherDecoder.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherEncoder.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorDecoder.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorEncoder.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftDecoder.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftEncoder.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntFrameDecoder.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntLengthEncoder.java rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/Packet.java (76%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/PacketHandler.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/PacketUtils.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/handler/HandshakePacketHandler.java (68%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/handler/LoginPacketHandler.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/handler/PlayPacketHandler.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/handler/StatusPacketHandler.java (70%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/handshake/Handshake.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/CompressionPacket.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/Disconnect.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/EncryptionRequest.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/EncryptionResponse.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/LoginPluginRequest.java (77%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/LoginPluginResponse.java (75%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/LoginStart.java (77%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/login/LoginSuccess.java (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/ActionBar.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/AwardStatistics.java (54%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/BossBar.java (94%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/CenterChunk.java (77%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/ChangeDifficulty.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/ChatMessage.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/ChunkDataAndUpdateLight.java (86%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/ClientCommand.java (70%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/ClientInformation.java (90%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/CommandSuggestionsRequest.java (76%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/ConfirmTeleportation.java (68%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/Cooldown.java (79%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/CreativeModeSlot.java (71%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/EditBook.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/EntityAnimation.java (79%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/EntityEvent.java (79%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/EntityMetadata.java (76%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/Equipment.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/Experience.java (57%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/FeatureFlags.java (70%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/GameEvent.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/Health.java (57%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/HeldItem.java (76%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/Interact.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/KeepAlive.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/Login.java (86%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PickupItem.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PlayerAbilities.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PlayerAction.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PlayerCommand.java (85%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PlayerInfo.java (93%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PlayerInfoRemove.java (73%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PlayerSession.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/PluginMessage.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/RecipeBookSettings.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/RemoveEntities.java (70%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/RenderDistance.java (65%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/Respawn.java (86%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SimulationDistance.java (67%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SpawnEntity.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SpawnExperienceOrb.java (81%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SpawnPlayer.java (77%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SpawnPosition.java (62%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SwingArm.java (72%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SynchronizePlayerPosition.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/SystemChatMessage.java (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/TabListHeaderFooter.java (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/TeleportToEntity.java (72%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/UpdateAttributes.java (67%) create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateRecipes.java create mode 100644 server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateTags.java rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/UseItem.java (74%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/UseItemOn.java (83%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/block/BlockAction.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/block/BlockChange.java (72%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/block/BlockDestroyStage.java (79%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/block/BlockEntityData.java (79%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/block/BlockUpdate.java (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/command/ChatCommand.java (84%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/command/CommandSuggestionsResponse.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/command/Commands.java (96%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/container/ClickContainer.java (87%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/container/ClickContainerButton.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/container/CloseContainer.java (76%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/container/ContainerContent.java (76%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/container/ContainerProperty.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/container/ContainerSlot.java (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/container/OpenScreen.java (77%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/EntityPosition.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/EntityPositionAndRotation.java (88%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/EntityRotation.java (79%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/HeadRotation.java (69%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/PlayerOnGround.java (65%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/PlayerPosition.java (82%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/PlayerPositionAndRotation.java (86%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/position/PlayerRotation.java (80%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/scoreboard/DisplayObjective.java (71%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/scoreboard/UpdateObjectives.java (79%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/scoreboard/UpdateScore.java (78%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/title/ClearTitles.java (70%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/title/Subtitle.java (72%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/title/Title.java (72%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/play/title/TitleAnimationTimes.java (81%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/status/StatusPing.java (74%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/status/StatusRequest.java (68%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/protocol/packet/status/StatusResponse.java (71%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/registry/SimpleRegistry.java (96%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/terminal/SimpleTerminal.java (90%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/util/BossBarListener.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/util/Constant.java (94%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/util/CoordinateUtil.java (92%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/util/EncryptionUtil.java (96%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/util/ItemList.java (87%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/util/MojangUtil.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/util/Utf8.java (97%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/MinecraftWorld.java (74%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/Worker.java (96%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/block/BlockParent.java (94%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/block/MineBlockState.java (98%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/chunk/LightData.java (92%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/chunk/MinecraftChunk.java (74%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/chunk/loader/AnvilLoader.java (86%) create mode 100644 server/src/main/java/de/bauhd/sculk/world/chunk/loader/ChunkLoader.java rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/chunk/loader/DefaultChunkLoader.java (71%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/dimension/DimensionRegistry.java (97%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/section/DirectIndirectPalette.java (98%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/section/EmptyPalette.java (87%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/section/Palette.java (89%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/section/PaletteHolder.java (97%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/section/Section.java (96%) rename server/src/main/java/de/bauhd/{minecraft/server => sculk}/world/section/SingleValuedPalette.java (92%) rename server/src/test/java/de/bauhd/{minecraft/server => sculk}/test/event/EventTest.java (69%) rename server/src/test/java/de/bauhd/{minecraft/server => sculk}/test/plugin/TestPlugin.java (51%) rename test-plugin/src/main/java/de/bauhd/{minecraft => sculk}/plugin/TestPlugin.java (71%) rename test-plugin/src/main/java/de/bauhd/{minecraft => sculk}/plugin/command/GameModeCommand.java (63%) rename test-plugin/src/main/java/de/bauhd/{minecraft => sculk}/plugin/world/TestGenerator.java (73%) diff --git a/api/src/main/java/de/bauhd/minecraft/server/command/BrigadierCommand.java b/api/src/main/java/de/bauhd/minecraft/server/command/BrigadierCommand.java deleted file mode 100644 index 849545fd..00000000 --- a/api/src/main/java/de/bauhd/minecraft/server/command/BrigadierCommand.java +++ /dev/null @@ -1,35 +0,0 @@ -package de.bauhd.minecraft.server.command; - -import com.mojang.brigadier.arguments.ArgumentType; -import com.mojang.brigadier.builder.LiteralArgumentBuilder; -import com.mojang.brigadier.builder.RequiredArgumentBuilder; -import com.mojang.brigadier.tree.LiteralCommandNode; -import org.jetbrains.annotations.NotNull; - -/** - * A command that uses Mojang's Brigadier for parsing - */ -public class BrigadierCommand { - - private final LiteralCommandNode node; - - public BrigadierCommand(final @NotNull LiteralArgumentBuilder argumentBuilder) { - this(argumentBuilder.build()); - } - - public BrigadierCommand(final @NotNull LiteralCommandNode commandNode) { - this.node = commandNode; - } - - public LiteralCommandNode node() { - return this.node; - } - - public static LiteralArgumentBuilder literal(final @NotNull String name) { - return LiteralArgumentBuilder.literal(name); - } - - public static RequiredArgumentBuilder argument(final @NotNull String name, final @NotNull ArgumentType type) { - return RequiredArgumentBuilder.argument(name, type); - } -} diff --git a/api/src/main/java/de/bauhd/minecraft/server/MinecraftConfig.java b/api/src/main/java/de/bauhd/sculk/MinecraftConfig.java similarity index 89% rename from api/src/main/java/de/bauhd/minecraft/server/MinecraftConfig.java rename to api/src/main/java/de/bauhd/sculk/MinecraftConfig.java index 567460c4..ee474e67 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/MinecraftConfig.java +++ b/api/src/main/java/de/bauhd/sculk/MinecraftConfig.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server; +package de.bauhd.sculk; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/MinecraftServer.java b/api/src/main/java/de/bauhd/sculk/MinecraftServer.java similarity index 85% rename from api/src/main/java/de/bauhd/minecraft/server/MinecraftServer.java rename to api/src/main/java/de/bauhd/sculk/MinecraftServer.java index 835aac92..4eaa7340 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/MinecraftServer.java +++ b/api/src/main/java/de/bauhd/sculk/MinecraftServer.java @@ -1,17 +1,17 @@ -package de.bauhd.minecraft.server; - -import de.bauhd.minecraft.server.command.CommandHandler; -import de.bauhd.minecraft.server.command.CommandSource; -import de.bauhd.minecraft.server.damage.DamageType; -import de.bauhd.minecraft.server.entity.Entity; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.event.EventHandler; -import de.bauhd.minecraft.server.container.Container; -import de.bauhd.minecraft.server.plugin.PluginHandler; -import de.bauhd.minecraft.server.registry.Registry; -import de.bauhd.minecraft.server.world.World; -import de.bauhd.minecraft.server.world.biome.Biome; -import de.bauhd.minecraft.server.world.dimension.Dimension; +package de.bauhd.sculk; + +import de.bauhd.sculk.command.CommandHandler; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.sculk.container.Container; +import de.bauhd.sculk.damage.DamageType; +import de.bauhd.sculk.entity.Entity; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.event.EventHandler; +import de.bauhd.sculk.plugin.PluginHandler; +import de.bauhd.sculk.registry.Registry; +import de.bauhd.sculk.world.World; +import de.bauhd.sculk.world.biome.Biome; +import de.bauhd.sculk.world.dimension.Dimension; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/Viewable.java b/api/src/main/java/de/bauhd/sculk/Viewable.java similarity index 85% rename from api/src/main/java/de/bauhd/minecraft/server/Viewable.java rename to api/src/main/java/de/bauhd/sculk/Viewable.java index 523301c1..dc87d674 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/Viewable.java +++ b/api/src/main/java/de/bauhd/sculk/Viewable.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server; +package de.bauhd.sculk; -import de.bauhd.minecraft.server.entity.player.Player; +import de.bauhd.sculk.entity.player.Player; import org.jetbrains.annotations.NotNull; import java.util.Collection; diff --git a/api/src/main/java/de/bauhd/minecraft/server/command/CommandHandler.java b/api/src/main/java/de/bauhd/sculk/command/CommandHandler.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/command/CommandHandler.java rename to api/src/main/java/de/bauhd/sculk/command/CommandHandler.java index 9226b627..9c7e8472 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/command/CommandHandler.java +++ b/api/src/main/java/de/bauhd/sculk/command/CommandHandler.java @@ -1,5 +1,6 @@ -package de.bauhd.minecraft.server.command; +package de.bauhd.sculk.command; +import com.mojang.brigadier.tree.LiteralCommandNode; import org.jetbrains.annotations.NotNull; /** @@ -9,10 +10,10 @@ public interface CommandHandler { /** * Registers the command. - * @param command the command to register + * @param node the command node to register * @return this command handler */ - @NotNull CommandHandler register(@NotNull BrigadierCommand command); + @NotNull CommandHandler register(@NotNull LiteralCommandNode node); /** * Executes the command as the specified {@link CommandSource}. diff --git a/api/src/main/java/de/bauhd/minecraft/server/command/CommandSource.java b/api/src/main/java/de/bauhd/sculk/command/CommandSource.java similarity index 85% rename from api/src/main/java/de/bauhd/minecraft/server/command/CommandSource.java rename to api/src/main/java/de/bauhd/sculk/command/CommandSource.java index db304ed6..4d792a24 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/command/CommandSource.java +++ b/api/src/main/java/de/bauhd/sculk/command/CommandSource.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.command; +package de.bauhd.sculk.command; import net.kyori.adventure.audience.Audience; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/connection/Connection.java b/api/src/main/java/de/bauhd/sculk/connection/Connection.java similarity index 89% rename from api/src/main/java/de/bauhd/minecraft/server/connection/Connection.java rename to api/src/main/java/de/bauhd/sculk/connection/Connection.java index 6c08cc45..7936973f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/connection/Connection.java +++ b/api/src/main/java/de/bauhd/sculk/connection/Connection.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.connection; +package de.bauhd.sculk.connection; import java.net.SocketAddress; diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/AnvilContainer.java b/api/src/main/java/de/bauhd/sculk/container/AnvilContainer.java similarity index 89% rename from api/src/main/java/de/bauhd/minecraft/server/container/AnvilContainer.java rename to api/src/main/java/de/bauhd/sculk/container/AnvilContainer.java index 2e75926f..4d5092e0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/AnvilContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/AnvilContainer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; /** * Represents a container of an anvil block. diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/BeaconContainer.java b/api/src/main/java/de/bauhd/sculk/container/BeaconContainer.java similarity index 92% rename from api/src/main/java/de/bauhd/minecraft/server/container/BeaconContainer.java rename to api/src/main/java/de/bauhd/sculk/container/BeaconContainer.java index 2608a28d..2d097c02 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/BeaconContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/BeaconContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.potion.PotionEffect; +import de.bauhd.sculk.potion.PotionEffect; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/BrewingStandContainer.java b/api/src/main/java/de/bauhd/sculk/container/BrewingStandContainer.java similarity index 93% rename from api/src/main/java/de/bauhd/minecraft/server/container/BrewingStandContainer.java rename to api/src/main/java/de/bauhd/sculk/container/BrewingStandContainer.java index 601aa2bd..46c3048a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/BrewingStandContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/BrewingStandContainer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; import org.jetbrains.annotations.Range; diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/Container.java b/api/src/main/java/de/bauhd/sculk/container/Container.java similarity index 94% rename from api/src/main/java/de/bauhd/minecraft/server/container/Container.java rename to api/src/main/java/de/bauhd/sculk/container/Container.java index db9436db..4a73ef28 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/Container.java +++ b/api/src/main/java/de/bauhd/sculk/container/Container.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.container.item.ItemStack; +import de.bauhd.sculk.container.item.ItemStack; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/EnchantmentTableContainer.java b/api/src/main/java/de/bauhd/sculk/container/EnchantmentTableContainer.java similarity index 97% rename from api/src/main/java/de/bauhd/minecraft/server/container/EnchantmentTableContainer.java rename to api/src/main/java/de/bauhd/sculk/container/EnchantmentTableContainer.java index 4592148c..d27d3fe0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/EnchantmentTableContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/EnchantmentTableContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.enchantment.Enchantment; +import de.bauhd.sculk.enchantment.Enchantment; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/FurnaceContainer.java b/api/src/main/java/de/bauhd/sculk/container/FurnaceContainer.java similarity index 95% rename from api/src/main/java/de/bauhd/minecraft/server/container/FurnaceContainer.java rename to api/src/main/java/de/bauhd/sculk/container/FurnaceContainer.java index 2fd33150..c61d4c9e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/FurnaceContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/FurnaceContainer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; /** * Represents a container of a furnace block. diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/Inventory.java b/api/src/main/java/de/bauhd/sculk/container/Inventory.java similarity index 86% rename from api/src/main/java/de/bauhd/minecraft/server/container/Inventory.java rename to api/src/main/java/de/bauhd/sculk/container/Inventory.java index 4e34707e..ae648ace 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/Inventory.java +++ b/api/src/main/java/de/bauhd/sculk/container/Inventory.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.container.item.ItemStack; +import de.bauhd.sculk.container.item.ItemStack; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/LecternContainer.java b/api/src/main/java/de/bauhd/sculk/container/LecternContainer.java similarity index 78% rename from api/src/main/java/de/bauhd/minecraft/server/container/LecternContainer.java rename to api/src/main/java/de/bauhd/sculk/container/LecternContainer.java index 2d6f7a79..bbc81fd5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/LecternContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/LecternContainer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; /** * Represents a container of a lectern block. diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/LoomContainer.java b/api/src/main/java/de/bauhd/sculk/container/LoomContainer.java similarity index 79% rename from api/src/main/java/de/bauhd/minecraft/server/container/LoomContainer.java rename to api/src/main/java/de/bauhd/sculk/container/LoomContainer.java index 0446f795..6f422287 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/LoomContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/LoomContainer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; /** * Represents a container of a loom block. diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/StonecutterContainer.java b/api/src/main/java/de/bauhd/sculk/container/StonecutterContainer.java similarity index 80% rename from api/src/main/java/de/bauhd/minecraft/server/container/StonecutterContainer.java rename to api/src/main/java/de/bauhd/sculk/container/StonecutterContainer.java index a056a2f7..692ec002 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/StonecutterContainer.java +++ b/api/src/main/java/de/bauhd/sculk/container/StonecutterContainer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; /** * Represents a container of a stone cutter. diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/item/ItemStack.java b/api/src/main/java/de/bauhd/sculk/container/item/ItemStack.java similarity index 98% rename from api/src/main/java/de/bauhd/minecraft/server/container/item/ItemStack.java rename to api/src/main/java/de/bauhd/sculk/container/item/ItemStack.java index f6c54e5c..a8894c06 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/item/ItemStack.java +++ b/api/src/main/java/de/bauhd/sculk/container/item/ItemStack.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container.item; +package de.bauhd.sculk.container.item; import net.kyori.adventure.nbt.BinaryTag; import net.kyori.adventure.nbt.CompoundBinaryTag; diff --git a/api/src/main/java/de/bauhd/minecraft/server/container/item/Material.java b/api/src/main/java/de/bauhd/sculk/container/item/Material.java similarity index 99% rename from api/src/main/java/de/bauhd/minecraft/server/container/item/Material.java rename to api/src/main/java/de/bauhd/sculk/container/item/Material.java index 2ebc99fb..d1457ca4 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/container/item/Material.java +++ b/api/src/main/java/de/bauhd/sculk/container/item/Material.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.container.item; +package de.bauhd.sculk.container.item; import java.util.HashMap; import java.util.Map; diff --git a/api/src/main/java/de/bauhd/minecraft/server/damage/DamageType.java b/api/src/main/java/de/bauhd/sculk/damage/DamageType.java similarity index 99% rename from api/src/main/java/de/bauhd/minecraft/server/damage/DamageType.java rename to api/src/main/java/de/bauhd/sculk/damage/DamageType.java index b356b957..2d31982a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/damage/DamageType.java +++ b/api/src/main/java/de/bauhd/sculk/damage/DamageType.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.damage; +package de.bauhd.sculk.damage; -import de.bauhd.minecraft.server.registry.Registry; +import de.bauhd.sculk.registry.Registry; import net.kyori.adventure.key.Key; import net.kyori.adventure.nbt.CompoundBinaryTag; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/enchantment/Enchantment.java b/api/src/main/java/de/bauhd/sculk/enchantment/Enchantment.java similarity index 97% rename from api/src/main/java/de/bauhd/minecraft/server/enchantment/Enchantment.java rename to api/src/main/java/de/bauhd/sculk/enchantment/Enchantment.java index 9a044775..8bf47d1f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/enchantment/Enchantment.java +++ b/api/src/main/java/de/bauhd/sculk/enchantment/Enchantment.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.enchantment; +package de.bauhd.sculk.enchantment; /** * An enum of all enchantments supported. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Ageable.java b/api/src/main/java/de/bauhd/sculk/entity/Ageable.java similarity index 91% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Ageable.java rename to api/src/main/java/de/bauhd/sculk/entity/Ageable.java index d217642f..8bdd922e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Ageable.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Ageable.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an entity that can age. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Allay.java b/api/src/main/java/de/bauhd/sculk/entity/Allay.java similarity index 63% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Allay.java rename to api/src/main/java/de/bauhd/sculk/entity/Allay.java index b4aa5aca..8b954146 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Allay.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Allay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an Allay. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Animal.java b/api/src/main/java/de/bauhd/sculk/entity/Animal.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Animal.java rename to api/src/main/java/de/bauhd/sculk/entity/Animal.java index 32286c44..dafc8a2f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Animal.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Animal.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an animal. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/AreaEffectCloud.java b/api/src/main/java/de/bauhd/sculk/entity/AreaEffectCloud.java similarity index 72% rename from api/src/main/java/de/bauhd/minecraft/server/entity/AreaEffectCloud.java rename to api/src/main/java/de/bauhd/sculk/entity/AreaEffectCloud.java index 4a712be1..85b61d1e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/AreaEffectCloud.java +++ b/api/src/main/java/de/bauhd/sculk/entity/AreaEffectCloud.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an area entity effect cloud entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ArmorStand.java b/api/src/main/java/de/bauhd/sculk/entity/ArmorStand.java similarity index 97% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ArmorStand.java rename to api/src/main/java/de/bauhd/sculk/entity/ArmorStand.java index a7c1d736..fdcbef3f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ArmorStand.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ArmorStand.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an armor stand. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Arrow.java b/api/src/main/java/de/bauhd/sculk/entity/Arrow.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Arrow.java rename to api/src/main/java/de/bauhd/sculk/entity/Arrow.java index 479b4a2f..b3c466aa 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Arrow.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Arrow.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an arrow entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Axolotl.java b/api/src/main/java/de/bauhd/sculk/entity/Axolotl.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Axolotl.java rename to api/src/main/java/de/bauhd/sculk/entity/Axolotl.java index 66bae816..f525ae38 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Axolotl.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Axolotl.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an axolotl entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Bat.java b/api/src/main/java/de/bauhd/sculk/entity/Bat.java similarity index 63% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Bat.java rename to api/src/main/java/de/bauhd/sculk/entity/Bat.java index 32bb9c7c..b7d0da20 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Bat.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Bat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a bat entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Bee.java b/api/src/main/java/de/bauhd/sculk/entity/Bee.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Bee.java rename to api/src/main/java/de/bauhd/sculk/entity/Bee.java index c92787f8..67efb032 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Bee.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Bee.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a bee entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Blaze.java b/api/src/main/java/de/bauhd/sculk/entity/Blaze.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Blaze.java rename to api/src/main/java/de/bauhd/sculk/entity/Blaze.java index 77bc1ccc..0eefc12f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Blaze.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Blaze.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a blaze entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/BlockDisplay.java b/api/src/main/java/de/bauhd/sculk/entity/BlockDisplay.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/BlockDisplay.java rename to api/src/main/java/de/bauhd/sculk/entity/BlockDisplay.java index 61de2193..bed6cbd7 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/BlockDisplay.java +++ b/api/src/main/java/de/bauhd/sculk/entity/BlockDisplay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a block display entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Boat.java b/api/src/main/java/de/bauhd/sculk/entity/Boat.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Boat.java rename to api/src/main/java/de/bauhd/sculk/entity/Boat.java index 9b7b0d6e..33d9e6d5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Boat.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Boat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a boat entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Camel.java b/api/src/main/java/de/bauhd/sculk/entity/Camel.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Camel.java rename to api/src/main/java/de/bauhd/sculk/entity/Camel.java index 494f833a..1b54bd53 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Camel.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Camel.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a camel entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Cat.java b/api/src/main/java/de/bauhd/sculk/entity/Cat.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Cat.java rename to api/src/main/java/de/bauhd/sculk/entity/Cat.java index e4b632a7..016fd6e0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Cat.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Cat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a cat entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/CaveSpider.java b/api/src/main/java/de/bauhd/sculk/entity/CaveSpider.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/CaveSpider.java rename to api/src/main/java/de/bauhd/sculk/entity/CaveSpider.java index 5e968fc7..b20143e0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/CaveSpider.java +++ b/api/src/main/java/de/bauhd/sculk/entity/CaveSpider.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a cave spider entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ChestBoat.java b/api/src/main/java/de/bauhd/sculk/entity/ChestBoat.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ChestBoat.java rename to api/src/main/java/de/bauhd/sculk/entity/ChestBoat.java index fd022a18..97c259d0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ChestBoat.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ChestBoat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a chest boat entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ChestMinecart.java b/api/src/main/java/de/bauhd/sculk/entity/ChestMinecart.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ChestMinecart.java rename to api/src/main/java/de/bauhd/sculk/entity/ChestMinecart.java index c952ae35..2ba02215 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ChestMinecart.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ChestMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a chest minecart entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Chicken.java b/api/src/main/java/de/bauhd/sculk/entity/Chicken.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Chicken.java rename to api/src/main/java/de/bauhd/sculk/entity/Chicken.java index 19ce64b5..81728458 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Chicken.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Chicken.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a chicken entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Cod.java b/api/src/main/java/de/bauhd/sculk/entity/Cod.java similarity index 63% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Cod.java rename to api/src/main/java/de/bauhd/sculk/entity/Cod.java index b5d3ae74..56fc0805 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Cod.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Cod.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a cod entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/CommandBlockMinecart.java b/api/src/main/java/de/bauhd/sculk/entity/CommandBlockMinecart.java similarity index 72% rename from api/src/main/java/de/bauhd/minecraft/server/entity/CommandBlockMinecart.java rename to api/src/main/java/de/bauhd/sculk/entity/CommandBlockMinecart.java index b541397e..795b7874 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/CommandBlockMinecart.java +++ b/api/src/main/java/de/bauhd/sculk/entity/CommandBlockMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a command block minecart entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Cow.java b/api/src/main/java/de/bauhd/sculk/entity/Cow.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Cow.java rename to api/src/main/java/de/bauhd/sculk/entity/Cow.java index 235e8292..864d8d0b 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Cow.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Cow.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a cow entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Creeper.java b/api/src/main/java/de/bauhd/sculk/entity/Creeper.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Creeper.java rename to api/src/main/java/de/bauhd/sculk/entity/Creeper.java index 453c9f78..0b37cc75 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Creeper.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Creeper.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a creeper entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Display.java b/api/src/main/java/de/bauhd/sculk/entity/Display.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Display.java rename to api/src/main/java/de/bauhd/sculk/entity/Display.java index 74e50816..1e0bd60b 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Display.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Display.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a display entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Dolphin.java b/api/src/main/java/de/bauhd/sculk/entity/Dolphin.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Dolphin.java rename to api/src/main/java/de/bauhd/sculk/entity/Dolphin.java index c7488add..5e566cb0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Dolphin.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Dolphin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a dolphin entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Donkey.java b/api/src/main/java/de/bauhd/sculk/entity/Donkey.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Donkey.java rename to api/src/main/java/de/bauhd/sculk/entity/Donkey.java index 9fd92b1a..b4dc8772 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Donkey.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Donkey.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a donkey entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/DragonFireball.java b/api/src/main/java/de/bauhd/sculk/entity/DragonFireball.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/DragonFireball.java rename to api/src/main/java/de/bauhd/sculk/entity/DragonFireball.java index c4517325..a101d35b 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/DragonFireball.java +++ b/api/src/main/java/de/bauhd/sculk/entity/DragonFireball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a dragon fireball entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Drowned.java b/api/src/main/java/de/bauhd/sculk/entity/Drowned.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Drowned.java rename to api/src/main/java/de/bauhd/sculk/entity/Drowned.java index 0f1f72a2..c87f43de 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Drowned.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Drowned.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a drowned entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Egg.java b/api/src/main/java/de/bauhd/sculk/entity/Egg.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Egg.java rename to api/src/main/java/de/bauhd/sculk/entity/Egg.java index 7a0ae04e..5dd2cd5d 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Egg.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Egg.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an egg entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ElderGuardian.java b/api/src/main/java/de/bauhd/sculk/entity/ElderGuardian.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ElderGuardian.java rename to api/src/main/java/de/bauhd/sculk/entity/ElderGuardian.java index 15d2f4d4..dc117c12 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ElderGuardian.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ElderGuardian.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an elder guardian entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/EndCrystal.java b/api/src/main/java/de/bauhd/sculk/entity/EndCrystal.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/EndCrystal.java rename to api/src/main/java/de/bauhd/sculk/entity/EndCrystal.java index 4dbdef46..77555cd1 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/EndCrystal.java +++ b/api/src/main/java/de/bauhd/sculk/entity/EndCrystal.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an end crystal entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/EnderDragon.java b/api/src/main/java/de/bauhd/sculk/entity/EnderDragon.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/EnderDragon.java rename to api/src/main/java/de/bauhd/sculk/entity/EnderDragon.java index 85f3d53d..2f563011 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/EnderDragon.java +++ b/api/src/main/java/de/bauhd/sculk/entity/EnderDragon.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an ender dragon entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/EnderPearl.java b/api/src/main/java/de/bauhd/sculk/entity/EnderPearl.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/EnderPearl.java rename to api/src/main/java/de/bauhd/sculk/entity/EnderPearl.java index f8fb69ac..9a984b26 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/EnderPearl.java +++ b/api/src/main/java/de/bauhd/sculk/entity/EnderPearl.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an ender pearl entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Enderman.java b/api/src/main/java/de/bauhd/sculk/entity/Enderman.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Enderman.java rename to api/src/main/java/de/bauhd/sculk/entity/Enderman.java index 20199852..e307431c 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Enderman.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Enderman.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an enderman entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Endermite.java b/api/src/main/java/de/bauhd/sculk/entity/Endermite.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Endermite.java rename to api/src/main/java/de/bauhd/sculk/entity/Endermite.java index 7ae6ef19..3de1e190 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Endermite.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Endermite.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an endermite entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Entity.java b/api/src/main/java/de/bauhd/sculk/entity/Entity.java similarity index 89% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Entity.java rename to api/src/main/java/de/bauhd/sculk/entity/Entity.java index 1331ec4d..19ce8476 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Entity.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Entity.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; -import de.bauhd.minecraft.server.Viewable; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.World; +import de.bauhd.sculk.Viewable; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.World; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/EntityType.java b/api/src/main/java/de/bauhd/sculk/entity/EntityType.java similarity index 99% rename from api/src/main/java/de/bauhd/minecraft/server/entity/EntityType.java rename to api/src/main/java/de/bauhd/sculk/entity/EntityType.java index b4cfad81..ebd7e786 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/EntityType.java +++ b/api/src/main/java/de/bauhd/sculk/entity/EntityType.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * All entity types possible. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Evoker.java b/api/src/main/java/de/bauhd/sculk/entity/Evoker.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Evoker.java rename to api/src/main/java/de/bauhd/sculk/entity/Evoker.java index ca8a972b..f329b382 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Evoker.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Evoker.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an evoker entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/EvokerFangs.java b/api/src/main/java/de/bauhd/sculk/entity/EvokerFangs.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/EvokerFangs.java rename to api/src/main/java/de/bauhd/sculk/entity/EvokerFangs.java index 7ed4ffda..f7e1415d 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/EvokerFangs.java +++ b/api/src/main/java/de/bauhd/sculk/entity/EvokerFangs.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an evoker fangs entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ExperienceBottle.java b/api/src/main/java/de/bauhd/sculk/entity/ExperienceBottle.java similarity index 71% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ExperienceBottle.java rename to api/src/main/java/de/bauhd/sculk/entity/ExperienceBottle.java index 2d79b033..a1bed0b3 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ExperienceBottle.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ExperienceBottle.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an experience bottle entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ExperienceOrb.java b/api/src/main/java/de/bauhd/sculk/entity/ExperienceOrb.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ExperienceOrb.java rename to api/src/main/java/de/bauhd/sculk/entity/ExperienceOrb.java index c39066ca..a631b067 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ExperienceOrb.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ExperienceOrb.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an experience orb entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/EyeOfEnder.java b/api/src/main/java/de/bauhd/sculk/entity/EyeOfEnder.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/EyeOfEnder.java rename to api/src/main/java/de/bauhd/sculk/entity/EyeOfEnder.java index b2cc8e60..b79f8151 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/EyeOfEnder.java +++ b/api/src/main/java/de/bauhd/sculk/entity/EyeOfEnder.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an eye of ender entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/FallingBlock.java b/api/src/main/java/de/bauhd/sculk/entity/FallingBlock.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/FallingBlock.java rename to api/src/main/java/de/bauhd/sculk/entity/FallingBlock.java index 957de0f7..b0e29e2c 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/FallingBlock.java +++ b/api/src/main/java/de/bauhd/sculk/entity/FallingBlock.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a falling block entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Fireball.java b/api/src/main/java/de/bauhd/sculk/entity/Fireball.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Fireball.java rename to api/src/main/java/de/bauhd/sculk/entity/Fireball.java index 014b73c3..b9032f5e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Fireball.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Fireball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a fireball entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/FireworkRocket.java b/api/src/main/java/de/bauhd/sculk/entity/FireworkRocket.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/FireworkRocket.java rename to api/src/main/java/de/bauhd/sculk/entity/FireworkRocket.java index daf8d8fe..801502dd 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/FireworkRocket.java +++ b/api/src/main/java/de/bauhd/sculk/entity/FireworkRocket.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a firework rocket entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/FishingBobber.java b/api/src/main/java/de/bauhd/sculk/entity/FishingBobber.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/FishingBobber.java rename to api/src/main/java/de/bauhd/sculk/entity/FishingBobber.java index e773f544..34c89032 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/FishingBobber.java +++ b/api/src/main/java/de/bauhd/sculk/entity/FishingBobber.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a fishing bobber entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Fox.java b/api/src/main/java/de/bauhd/sculk/entity/Fox.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Fox.java rename to api/src/main/java/de/bauhd/sculk/entity/Fox.java index 8f827e76..8eab1c9d 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Fox.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Fox.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a fox entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Frog.java b/api/src/main/java/de/bauhd/sculk/entity/Frog.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Frog.java rename to api/src/main/java/de/bauhd/sculk/entity/Frog.java index 34c10587..1573a6e3 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Frog.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Frog.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a frog entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/FurnaceMinecart.java b/api/src/main/java/de/bauhd/sculk/entity/FurnaceMinecart.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/FurnaceMinecart.java rename to api/src/main/java/de/bauhd/sculk/entity/FurnaceMinecart.java index 9fb9c187..908797f2 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/FurnaceMinecart.java +++ b/api/src/main/java/de/bauhd/sculk/entity/FurnaceMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a furnace minecart entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Ghast.java b/api/src/main/java/de/bauhd/sculk/entity/Ghast.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Ghast.java rename to api/src/main/java/de/bauhd/sculk/entity/Ghast.java index 5638cc24..b35cfa3d 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Ghast.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Ghast.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a ghast entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Giant.java b/api/src/main/java/de/bauhd/sculk/entity/Giant.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Giant.java rename to api/src/main/java/de/bauhd/sculk/entity/Giant.java index e3397dc9..87db604a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Giant.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Giant.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a giant entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/GlowItemFrame.java b/api/src/main/java/de/bauhd/sculk/entity/GlowItemFrame.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/GlowItemFrame.java rename to api/src/main/java/de/bauhd/sculk/entity/GlowItemFrame.java index 3977583f..ad089fa5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/GlowItemFrame.java +++ b/api/src/main/java/de/bauhd/sculk/entity/GlowItemFrame.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a glow item frame entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/GlowSquid.java b/api/src/main/java/de/bauhd/sculk/entity/GlowSquid.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/GlowSquid.java rename to api/src/main/java/de/bauhd/sculk/entity/GlowSquid.java index 0eb55d70..1b1e2d83 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/GlowSquid.java +++ b/api/src/main/java/de/bauhd/sculk/entity/GlowSquid.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a glow squid entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Goat.java b/api/src/main/java/de/bauhd/sculk/entity/Goat.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Goat.java rename to api/src/main/java/de/bauhd/sculk/entity/Goat.java index f1a9ac87..16507852 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Goat.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Goat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a goat entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Guardian.java b/api/src/main/java/de/bauhd/sculk/entity/Guardian.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Guardian.java rename to api/src/main/java/de/bauhd/sculk/entity/Guardian.java index 3e09d531..e3318b32 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Guardian.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Guardian.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a guardian entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Hoglin.java b/api/src/main/java/de/bauhd/sculk/entity/Hoglin.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Hoglin.java rename to api/src/main/java/de/bauhd/sculk/entity/Hoglin.java index 11a6cdc3..b08d2192 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Hoglin.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Hoglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a hoglin entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/HopperMinecart.java b/api/src/main/java/de/bauhd/sculk/entity/HopperMinecart.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/HopperMinecart.java rename to api/src/main/java/de/bauhd/sculk/entity/HopperMinecart.java index f4e5dba4..c946f084 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/HopperMinecart.java +++ b/api/src/main/java/de/bauhd/sculk/entity/HopperMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a hopper minecart entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Horse.java b/api/src/main/java/de/bauhd/sculk/entity/Horse.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Horse.java rename to api/src/main/java/de/bauhd/sculk/entity/Horse.java index f9882a01..d08ef950 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Horse.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Horse.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a horse entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Husk.java b/api/src/main/java/de/bauhd/sculk/entity/Husk.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Husk.java rename to api/src/main/java/de/bauhd/sculk/entity/Husk.java index b7fd0301..659bec85 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Husk.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Husk.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a husk entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Illusioner.java b/api/src/main/java/de/bauhd/sculk/entity/Illusioner.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Illusioner.java rename to api/src/main/java/de/bauhd/sculk/entity/Illusioner.java index 1de8802f..fab2c4d8 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Illusioner.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Illusioner.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an illusioner entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Interaction.java b/api/src/main/java/de/bauhd/sculk/entity/Interaction.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Interaction.java rename to api/src/main/java/de/bauhd/sculk/entity/Interaction.java index 9f38a278..298e3a3f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Interaction.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Interaction.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an interaction entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/IronGolem.java b/api/src/main/java/de/bauhd/sculk/entity/IronGolem.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/IronGolem.java rename to api/src/main/java/de/bauhd/sculk/entity/IronGolem.java index d2bc07e4..b4b7cad2 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/IronGolem.java +++ b/api/src/main/java/de/bauhd/sculk/entity/IronGolem.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an iron golem entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Item.java b/api/src/main/java/de/bauhd/sculk/entity/Item.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Item.java rename to api/src/main/java/de/bauhd/sculk/entity/Item.java index 9b21abc4..9fcfa097 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Item.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Item.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an item entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ItemDisplay.java b/api/src/main/java/de/bauhd/sculk/entity/ItemDisplay.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ItemDisplay.java rename to api/src/main/java/de/bauhd/sculk/entity/ItemDisplay.java index 3f7110f2..09c57d48 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ItemDisplay.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ItemDisplay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an item display entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ItemFrame.java b/api/src/main/java/de/bauhd/sculk/entity/ItemFrame.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ItemFrame.java rename to api/src/main/java/de/bauhd/sculk/entity/ItemFrame.java index c3325b01..353cd04a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ItemFrame.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ItemFrame.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents an item frame entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/LeashKnot.java b/api/src/main/java/de/bauhd/sculk/entity/LeashKnot.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/LeashKnot.java rename to api/src/main/java/de/bauhd/sculk/entity/LeashKnot.java index e1f25164..259acf77 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/LeashKnot.java +++ b/api/src/main/java/de/bauhd/sculk/entity/LeashKnot.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a leash knot entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/LightningBolt.java b/api/src/main/java/de/bauhd/sculk/entity/LightningBolt.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/LightningBolt.java rename to api/src/main/java/de/bauhd/sculk/entity/LightningBolt.java index 826682ef..ca5c9743 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/LightningBolt.java +++ b/api/src/main/java/de/bauhd/sculk/entity/LightningBolt.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a lighting bolt entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/LivingEntity.java b/api/src/main/java/de/bauhd/sculk/entity/LivingEntity.java similarity index 97% rename from api/src/main/java/de/bauhd/minecraft/server/entity/LivingEntity.java rename to api/src/main/java/de/bauhd/sculk/entity/LivingEntity.java index fbf8758d..7d42bad9 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/LivingEntity.java +++ b/api/src/main/java/de/bauhd/sculk/entity/LivingEntity.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a living entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Llama.java b/api/src/main/java/de/bauhd/sculk/entity/Llama.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Llama.java rename to api/src/main/java/de/bauhd/sculk/entity/Llama.java index 05df0ce7..f0271725 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Llama.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Llama.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a llama entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/LlamaSpit.java b/api/src/main/java/de/bauhd/sculk/entity/LlamaSpit.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/LlamaSpit.java rename to api/src/main/java/de/bauhd/sculk/entity/LlamaSpit.java index 3ca4b147..385955d0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/LlamaSpit.java +++ b/api/src/main/java/de/bauhd/sculk/entity/LlamaSpit.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a llama spit entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/MagmaCube.java b/api/src/main/java/de/bauhd/sculk/entity/MagmaCube.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/MagmaCube.java rename to api/src/main/java/de/bauhd/sculk/entity/MagmaCube.java index 6594d52c..e072f4a0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/MagmaCube.java +++ b/api/src/main/java/de/bauhd/sculk/entity/MagmaCube.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a magma cube entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Minecart.java b/api/src/main/java/de/bauhd/sculk/entity/Minecart.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Minecart.java rename to api/src/main/java/de/bauhd/sculk/entity/Minecart.java index 0da01461..26fd2889 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Minecart.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Minecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a minecart entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Mob.java b/api/src/main/java/de/bauhd/sculk/entity/Mob.java similarity index 83% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Mob.java rename to api/src/main/java/de/bauhd/sculk/entity/Mob.java index ac17b4f3..437808d7 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Mob.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Mob.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a mob entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Monster.java b/api/src/main/java/de/bauhd/sculk/entity/Monster.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Monster.java rename to api/src/main/java/de/bauhd/sculk/entity/Monster.java index cddc477c..dd5243e2 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Monster.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Monster.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a monster entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Mooshroom.java b/api/src/main/java/de/bauhd/sculk/entity/Mooshroom.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Mooshroom.java rename to api/src/main/java/de/bauhd/sculk/entity/Mooshroom.java index dc1622e2..a4a7bdcf 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Mooshroom.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Mooshroom.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a mooshroom entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Mule.java b/api/src/main/java/de/bauhd/sculk/entity/Mule.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Mule.java rename to api/src/main/java/de/bauhd/sculk/entity/Mule.java index ed6f17fb..99d3a818 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Mule.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Mule.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a mule entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Ocelot.java b/api/src/main/java/de/bauhd/sculk/entity/Ocelot.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Ocelot.java rename to api/src/main/java/de/bauhd/sculk/entity/Ocelot.java index 61f74cde..b86167c5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Ocelot.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Ocelot.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a ocelot entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Painting.java b/api/src/main/java/de/bauhd/sculk/entity/Painting.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Painting.java rename to api/src/main/java/de/bauhd/sculk/entity/Painting.java index 5abc34a1..01594994 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Painting.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Painting.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a painting entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Panda.java b/api/src/main/java/de/bauhd/sculk/entity/Panda.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Panda.java rename to api/src/main/java/de/bauhd/sculk/entity/Panda.java index 888a6796..6ad4c1f5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Panda.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Panda.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a panda entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Parrot.java b/api/src/main/java/de/bauhd/sculk/entity/Parrot.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Parrot.java rename to api/src/main/java/de/bauhd/sculk/entity/Parrot.java index 75aa860a..981f7ee3 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Parrot.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Parrot.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a parrot entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Phantom.java b/api/src/main/java/de/bauhd/sculk/entity/Phantom.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Phantom.java rename to api/src/main/java/de/bauhd/sculk/entity/Phantom.java index afbcba60..290fb4e5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Phantom.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Phantom.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a phantom entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Pig.java b/api/src/main/java/de/bauhd/sculk/entity/Pig.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Pig.java rename to api/src/main/java/de/bauhd/sculk/entity/Pig.java index b21489d1..fc798365 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Pig.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Pig.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a pig entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Piglin.java b/api/src/main/java/de/bauhd/sculk/entity/Piglin.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Piglin.java rename to api/src/main/java/de/bauhd/sculk/entity/Piglin.java index fdf8f1a1..5eddb7c6 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Piglin.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Piglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a piglin entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/PiglinBrute.java b/api/src/main/java/de/bauhd/sculk/entity/PiglinBrute.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/PiglinBrute.java rename to api/src/main/java/de/bauhd/sculk/entity/PiglinBrute.java index dff1523c..27af466b 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/PiglinBrute.java +++ b/api/src/main/java/de/bauhd/sculk/entity/PiglinBrute.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a piglin brute entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Pillager.java b/api/src/main/java/de/bauhd/sculk/entity/Pillager.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Pillager.java rename to api/src/main/java/de/bauhd/sculk/entity/Pillager.java index ef8a8316..24b1cb6a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Pillager.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Pillager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a pillager entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/PolarBear.java b/api/src/main/java/de/bauhd/sculk/entity/PolarBear.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/PolarBear.java rename to api/src/main/java/de/bauhd/sculk/entity/PolarBear.java index 5b85f9a2..194bd3ba 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/PolarBear.java +++ b/api/src/main/java/de/bauhd/sculk/entity/PolarBear.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a polar bear entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Potion.java b/api/src/main/java/de/bauhd/sculk/entity/Potion.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Potion.java rename to api/src/main/java/de/bauhd/sculk/entity/Potion.java index d0fef139..27ef90f6 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Potion.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Potion.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a potion entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Projectile.java b/api/src/main/java/de/bauhd/sculk/entity/Projectile.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Projectile.java rename to api/src/main/java/de/bauhd/sculk/entity/Projectile.java index 1be90b99..732ff64b 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Projectile.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Projectile.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a projectile entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Pufferfish.java b/api/src/main/java/de/bauhd/sculk/entity/Pufferfish.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Pufferfish.java rename to api/src/main/java/de/bauhd/sculk/entity/Pufferfish.java index d4d2dcbe..31d526b0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Pufferfish.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Pufferfish.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a puffer fish entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Rabbit.java b/api/src/main/java/de/bauhd/sculk/entity/Rabbit.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Rabbit.java rename to api/src/main/java/de/bauhd/sculk/entity/Rabbit.java index 28ae9301..257f38d0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Rabbit.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Rabbit.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a rabbit entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Ravager.java b/api/src/main/java/de/bauhd/sculk/entity/Ravager.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Ravager.java rename to api/src/main/java/de/bauhd/sculk/entity/Ravager.java index 5349dc7e..e93da7bd 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Ravager.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Ravager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a ravager entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Salmon.java b/api/src/main/java/de/bauhd/sculk/entity/Salmon.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Salmon.java rename to api/src/main/java/de/bauhd/sculk/entity/Salmon.java index e6451e52..6c1e7fef 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Salmon.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Salmon.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a salmon entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Sheep.java b/api/src/main/java/de/bauhd/sculk/entity/Sheep.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Sheep.java rename to api/src/main/java/de/bauhd/sculk/entity/Sheep.java index 250cd29f..39182a2f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Sheep.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Sheep.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a sheep entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Shulker.java b/api/src/main/java/de/bauhd/sculk/entity/Shulker.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Shulker.java rename to api/src/main/java/de/bauhd/sculk/entity/Shulker.java index f02be57e..5091fb90 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Shulker.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Shulker.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a shulker entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ShulkerBullet.java b/api/src/main/java/de/bauhd/sculk/entity/ShulkerBullet.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ShulkerBullet.java rename to api/src/main/java/de/bauhd/sculk/entity/ShulkerBullet.java index c5410b28..ba17ddce 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ShulkerBullet.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ShulkerBullet.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a shulker bullet entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Silverfish.java b/api/src/main/java/de/bauhd/sculk/entity/Silverfish.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Silverfish.java rename to api/src/main/java/de/bauhd/sculk/entity/Silverfish.java index f0ae52f4..5bafb51c 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Silverfish.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Silverfish.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a silverfish entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Skeleton.java b/api/src/main/java/de/bauhd/sculk/entity/Skeleton.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Skeleton.java rename to api/src/main/java/de/bauhd/sculk/entity/Skeleton.java index 5e718ef7..7a8a9114 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Skeleton.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Skeleton.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a skeleton entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/SkeletonHorse.java b/api/src/main/java/de/bauhd/sculk/entity/SkeletonHorse.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/SkeletonHorse.java rename to api/src/main/java/de/bauhd/sculk/entity/SkeletonHorse.java index 82bb1bec..9b21f6da 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/SkeletonHorse.java +++ b/api/src/main/java/de/bauhd/sculk/entity/SkeletonHorse.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a skeleton horse entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Slime.java b/api/src/main/java/de/bauhd/sculk/entity/Slime.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Slime.java rename to api/src/main/java/de/bauhd/sculk/entity/Slime.java index bc51ab17..8f32319e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Slime.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Slime.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a slime entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/SmallFireball.java b/api/src/main/java/de/bauhd/sculk/entity/SmallFireball.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/SmallFireball.java rename to api/src/main/java/de/bauhd/sculk/entity/SmallFireball.java index 691231cb..842cd46f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/SmallFireball.java +++ b/api/src/main/java/de/bauhd/sculk/entity/SmallFireball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a small fireball entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Sniffer.java b/api/src/main/java/de/bauhd/sculk/entity/Sniffer.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Sniffer.java rename to api/src/main/java/de/bauhd/sculk/entity/Sniffer.java index 4e4e037f..3f5c7d93 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Sniffer.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Sniffer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a sniffer entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/SnowGolem.java b/api/src/main/java/de/bauhd/sculk/entity/SnowGolem.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/SnowGolem.java rename to api/src/main/java/de/bauhd/sculk/entity/SnowGolem.java index b0659cab..8fd63c02 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/SnowGolem.java +++ b/api/src/main/java/de/bauhd/sculk/entity/SnowGolem.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a snow golem entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Snowball.java b/api/src/main/java/de/bauhd/sculk/entity/Snowball.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Snowball.java rename to api/src/main/java/de/bauhd/sculk/entity/Snowball.java index 2b987ab9..50db38c8 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Snowball.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Snowball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a snowball entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/SpawnerMinecart.java b/api/src/main/java/de/bauhd/sculk/entity/SpawnerMinecart.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/SpawnerMinecart.java rename to api/src/main/java/de/bauhd/sculk/entity/SpawnerMinecart.java index 8ce4554f..a4724829 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/SpawnerMinecart.java +++ b/api/src/main/java/de/bauhd/sculk/entity/SpawnerMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a spawner minecart entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/SpectralArrow.java b/api/src/main/java/de/bauhd/sculk/entity/SpectralArrow.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/SpectralArrow.java rename to api/src/main/java/de/bauhd/sculk/entity/SpectralArrow.java index d6ac9e0a..a3a23663 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/SpectralArrow.java +++ b/api/src/main/java/de/bauhd/sculk/entity/SpectralArrow.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a spectral arrow entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Spider.java b/api/src/main/java/de/bauhd/sculk/entity/Spider.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Spider.java rename to api/src/main/java/de/bauhd/sculk/entity/Spider.java index a379db36..171f6b24 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Spider.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Spider.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a spider entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Squid.java b/api/src/main/java/de/bauhd/sculk/entity/Squid.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Squid.java rename to api/src/main/java/de/bauhd/sculk/entity/Squid.java index 32f67fac..0d3b6999 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Squid.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Squid.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a squid entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Stray.java b/api/src/main/java/de/bauhd/sculk/entity/Stray.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Stray.java rename to api/src/main/java/de/bauhd/sculk/entity/Stray.java index aa018fb6..ddc93dd1 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Stray.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Stray.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a stray entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Strider.java b/api/src/main/java/de/bauhd/sculk/entity/Strider.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Strider.java rename to api/src/main/java/de/bauhd/sculk/entity/Strider.java index f614b8d7..9468a2e8 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Strider.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Strider.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a strider entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Tadpole.java b/api/src/main/java/de/bauhd/sculk/entity/Tadpole.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Tadpole.java rename to api/src/main/java/de/bauhd/sculk/entity/Tadpole.java index aeaf0af2..88358c92 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Tadpole.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Tadpole.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a tadpole entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Tameable.java b/api/src/main/java/de/bauhd/sculk/entity/Tameable.java similarity index 94% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Tameable.java rename to api/src/main/java/de/bauhd/sculk/entity/Tameable.java index 4252053b..3ad79a06 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Tameable.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Tameable.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/TextDisplay.java b/api/src/main/java/de/bauhd/sculk/entity/TextDisplay.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/TextDisplay.java rename to api/src/main/java/de/bauhd/sculk/entity/TextDisplay.java index f66f27ac..dc5801f4 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/TextDisplay.java +++ b/api/src/main/java/de/bauhd/sculk/entity/TextDisplay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a text display entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Tnt.java b/api/src/main/java/de/bauhd/sculk/entity/Tnt.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Tnt.java rename to api/src/main/java/de/bauhd/sculk/entity/Tnt.java index 56c6e87f..4502e1ba 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Tnt.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Tnt.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a tnt entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/TntMinecart.java b/api/src/main/java/de/bauhd/sculk/entity/TntMinecart.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/TntMinecart.java rename to api/src/main/java/de/bauhd/sculk/entity/TntMinecart.java index 48961f1d..2f0455cc 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/TntMinecart.java +++ b/api/src/main/java/de/bauhd/sculk/entity/TntMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a tnt minecart entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/TraderLlama.java b/api/src/main/java/de/bauhd/sculk/entity/TraderLlama.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/TraderLlama.java rename to api/src/main/java/de/bauhd/sculk/entity/TraderLlama.java index 5722c48b..0719f18f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/TraderLlama.java +++ b/api/src/main/java/de/bauhd/sculk/entity/TraderLlama.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a trader llama entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Trident.java b/api/src/main/java/de/bauhd/sculk/entity/Trident.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Trident.java rename to api/src/main/java/de/bauhd/sculk/entity/Trident.java index 639b6ca9..9c8ad5b5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Trident.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Trident.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a trident entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/TropicalFish.java b/api/src/main/java/de/bauhd/sculk/entity/TropicalFish.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/TropicalFish.java rename to api/src/main/java/de/bauhd/sculk/entity/TropicalFish.java index a3d4633b..1d0aa262 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/TropicalFish.java +++ b/api/src/main/java/de/bauhd/sculk/entity/TropicalFish.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a tropical fish entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Turtle.java b/api/src/main/java/de/bauhd/sculk/entity/Turtle.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Turtle.java rename to api/src/main/java/de/bauhd/sculk/entity/Turtle.java index f87bbc29..3469e6d0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Turtle.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Turtle.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a turtle entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Vex.java b/api/src/main/java/de/bauhd/sculk/entity/Vex.java similarity index 63% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Vex.java rename to api/src/main/java/de/bauhd/sculk/entity/Vex.java index ba792f76..84da8b0e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Vex.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Vex.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a vex entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Villager.java b/api/src/main/java/de/bauhd/sculk/entity/Villager.java similarity index 66% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Villager.java rename to api/src/main/java/de/bauhd/sculk/entity/Villager.java index d3a62ad7..cc5ca405 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Villager.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Villager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a villager entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Vindicator.java b/api/src/main/java/de/bauhd/sculk/entity/Vindicator.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Vindicator.java rename to api/src/main/java/de/bauhd/sculk/entity/Vindicator.java index 0a1f6343..59fa27b9 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Vindicator.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Vindicator.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a vindicator entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/WanderingTrader.java b/api/src/main/java/de/bauhd/sculk/entity/WanderingTrader.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/entity/WanderingTrader.java rename to api/src/main/java/de/bauhd/sculk/entity/WanderingTrader.java index 49551203..15ad6f9a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/WanderingTrader.java +++ b/api/src/main/java/de/bauhd/sculk/entity/WanderingTrader.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a wandering trader entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Warden.java b/api/src/main/java/de/bauhd/sculk/entity/Warden.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Warden.java rename to api/src/main/java/de/bauhd/sculk/entity/Warden.java index da5a5c54..36bd07f9 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Warden.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Warden.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a warden entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Witch.java b/api/src/main/java/de/bauhd/sculk/entity/Witch.java similarity index 64% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Witch.java rename to api/src/main/java/de/bauhd/sculk/entity/Witch.java index 7ff8c12f..197ce64a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Witch.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Witch.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a witch entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Wither.java b/api/src/main/java/de/bauhd/sculk/entity/Wither.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Wither.java rename to api/src/main/java/de/bauhd/sculk/entity/Wither.java index 28593d50..8cb9c9fd 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Wither.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Wither.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a wither entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/WitherSkeleton.java b/api/src/main/java/de/bauhd/sculk/entity/WitherSkeleton.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/WitherSkeleton.java rename to api/src/main/java/de/bauhd/sculk/entity/WitherSkeleton.java index 667ff16d..296147b0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/WitherSkeleton.java +++ b/api/src/main/java/de/bauhd/sculk/entity/WitherSkeleton.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a wither skeleton entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/WitherSkull.java b/api/src/main/java/de/bauhd/sculk/entity/WitherSkull.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/WitherSkull.java rename to api/src/main/java/de/bauhd/sculk/entity/WitherSkull.java index 5a83f74a..bc909888 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/WitherSkull.java +++ b/api/src/main/java/de/bauhd/sculk/entity/WitherSkull.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a wither skull entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Wolf.java b/api/src/main/java/de/bauhd/sculk/entity/Wolf.java similarity index 67% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Wolf.java rename to api/src/main/java/de/bauhd/sculk/entity/Wolf.java index 39baaa68..7730cd56 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Wolf.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Wolf.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a wolf entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Zoglin.java b/api/src/main/java/de/bauhd/sculk/entity/Zoglin.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Zoglin.java rename to api/src/main/java/de/bauhd/sculk/entity/Zoglin.java index d3ecc4bd..e079cf6a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Zoglin.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Zoglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a zoglin entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/Zombie.java b/api/src/main/java/de/bauhd/sculk/entity/Zombie.java similarity index 65% rename from api/src/main/java/de/bauhd/minecraft/server/entity/Zombie.java rename to api/src/main/java/de/bauhd/sculk/entity/Zombie.java index 6f222d9a..31b91210 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/Zombie.java +++ b/api/src/main/java/de/bauhd/sculk/entity/Zombie.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a zombie entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ZombieHorse.java b/api/src/main/java/de/bauhd/sculk/entity/ZombieHorse.java similarity index 68% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ZombieHorse.java rename to api/src/main/java/de/bauhd/sculk/entity/ZombieHorse.java index 7bea9116..4b5002d2 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ZombieHorse.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ZombieHorse.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a zombie horse entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ZombieVillager.java b/api/src/main/java/de/bauhd/sculk/entity/ZombieVillager.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ZombieVillager.java rename to api/src/main/java/de/bauhd/sculk/entity/ZombieVillager.java index 2102dc66..3e42dee1 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ZombieVillager.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ZombieVillager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a zombie villager entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/ZombifiedPiglin.java b/api/src/main/java/de/bauhd/sculk/entity/ZombifiedPiglin.java similarity index 70% rename from api/src/main/java/de/bauhd/minecraft/server/entity/ZombifiedPiglin.java rename to api/src/main/java/de/bauhd/sculk/entity/ZombifiedPiglin.java index 55c19de5..34bcb513 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/ZombifiedPiglin.java +++ b/api/src/main/java/de/bauhd/sculk/entity/ZombifiedPiglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; /** * Represents a zombified piglin entity. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/player/GameMode.java b/api/src/main/java/de/bauhd/sculk/entity/player/GameMode.java similarity index 76% rename from api/src/main/java/de/bauhd/minecraft/server/entity/player/GameMode.java rename to api/src/main/java/de/bauhd/sculk/entity/player/GameMode.java index 4305c3d0..f0e9d8c7 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/player/GameMode.java +++ b/api/src/main/java/de/bauhd/sculk/entity/player/GameMode.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity.player; +package de.bauhd.sculk.entity.player; /** * Represents the types of game modes a {@link Player} can have. diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/player/GameProfile.java b/api/src/main/java/de/bauhd/sculk/entity/player/GameProfile.java similarity index 93% rename from api/src/main/java/de/bauhd/minecraft/server/entity/player/GameProfile.java rename to api/src/main/java/de/bauhd/sculk/entity/player/GameProfile.java index cf78aa28..27420c32 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/player/GameProfile.java +++ b/api/src/main/java/de/bauhd/sculk/entity/player/GameProfile.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity.player; +package de.bauhd.sculk.entity.player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/player/Player.java b/api/src/main/java/de/bauhd/sculk/entity/player/Player.java similarity index 92% rename from api/src/main/java/de/bauhd/minecraft/server/entity/player/Player.java rename to api/src/main/java/de/bauhd/sculk/entity/player/Player.java index 84256ac7..625b8349 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/player/Player.java +++ b/api/src/main/java/de/bauhd/sculk/entity/player/Player.java @@ -1,10 +1,10 @@ -package de.bauhd.minecraft.server.entity.player; +package de.bauhd.sculk.entity.player; -import de.bauhd.minecraft.server.command.CommandSource; -import de.bauhd.minecraft.server.connection.Connection; -import de.bauhd.minecraft.server.entity.LivingEntity; -import de.bauhd.minecraft.server.container.Container; -import de.bauhd.minecraft.server.container.Inventory; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.sculk.connection.Connection; +import de.bauhd.sculk.container.Container; +import de.bauhd.sculk.container.Inventory; +import de.bauhd.sculk.entity.LivingEntity; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/player/PlayerInfoEntry.java b/api/src/main/java/de/bauhd/sculk/entity/player/PlayerInfoEntry.java similarity index 94% rename from api/src/main/java/de/bauhd/minecraft/server/entity/player/PlayerInfoEntry.java rename to api/src/main/java/de/bauhd/sculk/entity/player/PlayerInfoEntry.java index 3492e168..4051eec9 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/player/PlayerInfoEntry.java +++ b/api/src/main/java/de/bauhd/sculk/entity/player/PlayerInfoEntry.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity.player; +package de.bauhd.sculk.entity.player; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/entity/player/PlayerSettings.java b/api/src/main/java/de/bauhd/sculk/entity/player/PlayerSettings.java similarity index 96% rename from api/src/main/java/de/bauhd/minecraft/server/entity/player/PlayerSettings.java rename to api/src/main/java/de/bauhd/sculk/entity/player/PlayerSettings.java index 3d42e10c..00e5daf5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/entity/player/PlayerSettings.java +++ b/api/src/main/java/de/bauhd/sculk/entity/player/PlayerSettings.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity.player; +package de.bauhd.sculk.entity.player; import java.util.Locale; diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/EventHandler.java b/api/src/main/java/de/bauhd/sculk/event/EventHandler.java similarity index 96% rename from api/src/main/java/de/bauhd/minecraft/server/event/EventHandler.java rename to api/src/main/java/de/bauhd/sculk/event/EventHandler.java index f835cb34..fbcedcfc 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/EventHandler.java +++ b/api/src/main/java/de/bauhd/sculk/event/EventHandler.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.event; +package de.bauhd.sculk.event; -import de.bauhd.minecraft.server.plugin.Plugin; +import de.bauhd.sculk.plugin.Plugin; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/EventOrder.java b/api/src/main/java/de/bauhd/sculk/event/EventOrder.java similarity index 87% rename from api/src/main/java/de/bauhd/minecraft/server/event/EventOrder.java rename to api/src/main/java/de/bauhd/sculk/event/EventOrder.java index 072c0370..ab4c34cc 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/EventOrder.java +++ b/api/src/main/java/de/bauhd/sculk/event/EventOrder.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.event; +package de.bauhd.sculk.event; public final class EventOrder { diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/ResultedEvent.java b/api/src/main/java/de/bauhd/sculk/event/ResultedEvent.java similarity index 96% rename from api/src/main/java/de/bauhd/minecraft/server/event/ResultedEvent.java rename to api/src/main/java/de/bauhd/sculk/event/ResultedEvent.java index 1dab777d..363d5ce6 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/ResultedEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/ResultedEvent.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.event; +package de.bauhd.sculk.event; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/Subscribe.java b/api/src/main/java/de/bauhd/sculk/event/Subscribe.java similarity index 90% rename from api/src/main/java/de/bauhd/minecraft/server/event/Subscribe.java rename to api/src/main/java/de/bauhd/sculk/event/Subscribe.java index 3415cd73..63df6ac5 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/Subscribe.java +++ b/api/src/main/java/de/bauhd/sculk/event/Subscribe.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.event; +package de.bauhd.sculk.event; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/block/BlockBreakEvent.java b/api/src/main/java/de/bauhd/sculk/event/block/BlockBreakEvent.java similarity index 74% rename from api/src/main/java/de/bauhd/minecraft/server/event/block/BlockBreakEvent.java rename to api/src/main/java/de/bauhd/sculk/event/block/BlockBreakEvent.java index 1c5320a7..904bcfa0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/block/BlockBreakEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/block/BlockBreakEvent.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.event.block; +package de.bauhd.sculk.event.block; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.event.ResultedEvent; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.block.BlockState; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.event.ResultedEvent; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.block.BlockState; import org.jetbrains.annotations.NotNull; public final class BlockBreakEvent extends ResultedEvent { diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/block/BlockPlaceEvent.java b/api/src/main/java/de/bauhd/sculk/event/block/BlockPlaceEvent.java similarity index 74% rename from api/src/main/java/de/bauhd/minecraft/server/event/block/BlockPlaceEvent.java rename to api/src/main/java/de/bauhd/sculk/event/block/BlockPlaceEvent.java index 63eff664..cb6d7dba 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/block/BlockPlaceEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/block/BlockPlaceEvent.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.event.block; +package de.bauhd.sculk.event.block; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.event.ResultedEvent; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.block.BlockState; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.event.ResultedEvent; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.block.BlockState; import org.jetbrains.annotations.NotNull; public final class BlockPlaceEvent extends ResultedEvent { diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/command/CommandExecuteEvent.java b/api/src/main/java/de/bauhd/sculk/event/command/CommandExecuteEvent.java similarity index 80% rename from api/src/main/java/de/bauhd/minecraft/server/event/command/CommandExecuteEvent.java rename to api/src/main/java/de/bauhd/sculk/event/command/CommandExecuteEvent.java index 114503c8..8f1d1c77 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/command/CommandExecuteEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/command/CommandExecuteEvent.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.event.command; +package de.bauhd.sculk.event.command; -import de.bauhd.minecraft.server.command.CommandSource; -import de.bauhd.minecraft.server.event.ResultedEvent; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.sculk.event.ResultedEvent; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/connection/ServerPingEvent.java b/api/src/main/java/de/bauhd/sculk/event/connection/ServerPingEvent.java similarity index 94% rename from api/src/main/java/de/bauhd/minecraft/server/event/connection/ServerPingEvent.java rename to api/src/main/java/de/bauhd/sculk/event/connection/ServerPingEvent.java index 80a36432..0433fa73 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/connection/ServerPingEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/connection/ServerPingEvent.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.event.connection; +package de.bauhd.sculk.event.connection; -import de.bauhd.minecraft.server.connection.Connection; +import de.bauhd.sculk.connection.Connection; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/lifecycle/ServerInitializeEvent.java b/api/src/main/java/de/bauhd/sculk/event/lifecycle/ServerInitializeEvent.java similarity index 76% rename from api/src/main/java/de/bauhd/minecraft/server/event/lifecycle/ServerInitializeEvent.java rename to api/src/main/java/de/bauhd/sculk/event/lifecycle/ServerInitializeEvent.java index 2e7f95d4..ef617c3f 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/lifecycle/ServerInitializeEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/lifecycle/ServerInitializeEvent.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.event.lifecycle; +package de.bauhd.sculk.event.lifecycle; /** * Represents an event that fires when the server is finished with loading, but before connections will be accepted. diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/lifecycle/ServerShutdownEvent.java b/api/src/main/java/de/bauhd/sculk/event/lifecycle/ServerShutdownEvent.java similarity index 69% rename from api/src/main/java/de/bauhd/minecraft/server/event/lifecycle/ServerShutdownEvent.java rename to api/src/main/java/de/bauhd/sculk/event/lifecycle/ServerShutdownEvent.java index 12f1e739..eea55376 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/lifecycle/ServerShutdownEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/lifecycle/ServerShutdownEvent.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.event.lifecycle; +package de.bauhd.sculk.event.lifecycle; /** * Represents an event that fires when the server will be stopped. diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerChatEvent.java b/api/src/main/java/de/bauhd/sculk/event/player/PlayerChatEvent.java similarity index 80% rename from api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerChatEvent.java rename to api/src/main/java/de/bauhd/sculk/event/player/PlayerChatEvent.java index 70861246..04cccfa8 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerChatEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/player/PlayerChatEvent.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.event.player; +package de.bauhd.sculk.event.player; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.event.ResultedEvent; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.event.ResultedEvent; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerClickContainerButtonEvent.java b/api/src/main/java/de/bauhd/sculk/event/player/PlayerClickContainerButtonEvent.java similarity index 81% rename from api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerClickContainerButtonEvent.java rename to api/src/main/java/de/bauhd/sculk/event/player/PlayerClickContainerButtonEvent.java index 29b47ee5..e3840ce0 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerClickContainerButtonEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/player/PlayerClickContainerButtonEvent.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.event.player; +package de.bauhd.sculk.event.player; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.container.Container; +import de.bauhd.sculk.container.Container; +import de.bauhd.sculk.entity.player.Player; import org.jetbrains.annotations.NotNull; import java.util.Objects; diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerClickContainerEvent.java b/api/src/main/java/de/bauhd/sculk/event/player/PlayerClickContainerEvent.java similarity index 79% rename from api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerClickContainerEvent.java rename to api/src/main/java/de/bauhd/sculk/event/player/PlayerClickContainerEvent.java index 8f2f5b90..e5f13a13 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerClickContainerEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/player/PlayerClickContainerEvent.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.event.player; +package de.bauhd.sculk.event.player; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.container.Container; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.event.ResultedEvent; +import de.bauhd.sculk.container.Container; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.event.ResultedEvent; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerInitialEvent.java b/api/src/main/java/de/bauhd/sculk/event/player/PlayerInitialEvent.java similarity index 81% rename from api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerInitialEvent.java rename to api/src/main/java/de/bauhd/sculk/event/player/PlayerInitialEvent.java index c5b21996..96d84fbb 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerInitialEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/player/PlayerInitialEvent.java @@ -1,10 +1,10 @@ -package de.bauhd.minecraft.server.event.player; +package de.bauhd.sculk.event.player; -import de.bauhd.minecraft.server.connection.Connection; -import de.bauhd.minecraft.server.entity.player.GameMode; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.World; +import de.bauhd.sculk.connection.Connection; +import de.bauhd.sculk.entity.player.GameMode; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.World; import net.kyori.adventure.permission.PermissionChecker; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerJoinEvent.java b/api/src/main/java/de/bauhd/sculk/event/player/PlayerJoinEvent.java similarity index 78% rename from api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerJoinEvent.java rename to api/src/main/java/de/bauhd/sculk/event/player/PlayerJoinEvent.java index 38d1e3f7..a5432465 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerJoinEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/player/PlayerJoinEvent.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.event.player; +package de.bauhd.sculk.event.player; -import de.bauhd.minecraft.server.entity.player.Player; +import de.bauhd.sculk.entity.player.Player; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerUseItemEvent.java b/api/src/main/java/de/bauhd/sculk/event/player/PlayerUseItemEvent.java similarity index 74% rename from api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerUseItemEvent.java rename to api/src/main/java/de/bauhd/sculk/event/player/PlayerUseItemEvent.java index e83e8fc9..ee6f78e7 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/event/player/PlayerUseItemEvent.java +++ b/api/src/main/java/de/bauhd/sculk/event/player/PlayerUseItemEvent.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.event.player; +package de.bauhd.sculk.event.player; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.event.ResultedEvent; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.event.ResultedEvent; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/plugin/Plugin.java b/api/src/main/java/de/bauhd/sculk/plugin/Plugin.java similarity index 91% rename from api/src/main/java/de/bauhd/minecraft/server/plugin/Plugin.java rename to api/src/main/java/de/bauhd/sculk/plugin/Plugin.java index fb042a26..f40d2579 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/plugin/Plugin.java +++ b/api/src/main/java/de/bauhd/sculk/plugin/Plugin.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.plugin; +package de.bauhd.sculk.plugin; -import de.bauhd.minecraft.server.MinecraftServer; +import de.bauhd.sculk.MinecraftServer; import net.kyori.adventure.text.logger.slf4j.ComponentLogger; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/plugin/PluginAnnotationProcessor.java b/api/src/main/java/de/bauhd/sculk/plugin/PluginAnnotationProcessor.java similarity index 92% rename from api/src/main/java/de/bauhd/minecraft/server/plugin/PluginAnnotationProcessor.java rename to api/src/main/java/de/bauhd/sculk/plugin/PluginAnnotationProcessor.java index f9b4a4ab..03f7bbc2 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/plugin/PluginAnnotationProcessor.java +++ b/api/src/main/java/de/bauhd/sculk/plugin/PluginAnnotationProcessor.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.plugin; +package de.bauhd.sculk.plugin; import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; @@ -13,7 +13,7 @@ /** * Represents an annotation processor that creates the plugin file for a plugin. */ -@SupportedAnnotationTypes("de.bauhd.minecraft.server.plugin.PluginDescription") +@SupportedAnnotationTypes("de.bauhd.sculk.plugin.PluginDescription") public final class PluginAnnotationProcessor extends AbstractProcessor { @Override diff --git a/api/src/main/java/de/bauhd/minecraft/server/plugin/PluginDescription.java b/api/src/main/java/de/bauhd/sculk/plugin/PluginDescription.java similarity index 87% rename from api/src/main/java/de/bauhd/minecraft/server/plugin/PluginDescription.java rename to api/src/main/java/de/bauhd/sculk/plugin/PluginDescription.java index 076be3f9..fb9c3ed3 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/plugin/PluginDescription.java +++ b/api/src/main/java/de/bauhd/sculk/plugin/PluginDescription.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.plugin; +package de.bauhd.sculk.plugin; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/api/src/main/java/de/bauhd/minecraft/server/plugin/PluginHandler.java b/api/src/main/java/de/bauhd/sculk/plugin/PluginHandler.java similarity index 94% rename from api/src/main/java/de/bauhd/minecraft/server/plugin/PluginHandler.java rename to api/src/main/java/de/bauhd/sculk/plugin/PluginHandler.java index 8937084f..5d2b44af 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/plugin/PluginHandler.java +++ b/api/src/main/java/de/bauhd/sculk/plugin/PluginHandler.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.plugin; +package de.bauhd.sculk.plugin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/de/bauhd/minecraft/server/potion/PotionEffect.java b/api/src/main/java/de/bauhd/sculk/potion/PotionEffect.java similarity index 98% rename from api/src/main/java/de/bauhd/minecraft/server/potion/PotionEffect.java rename to api/src/main/java/de/bauhd/sculk/potion/PotionEffect.java index d97f2030..b6799ab6 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/potion/PotionEffect.java +++ b/api/src/main/java/de/bauhd/sculk/potion/PotionEffect.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.potion; +package de.bauhd.sculk.potion; /** * An enum of all supported potion effects. diff --git a/api/src/main/java/de/bauhd/minecraft/server/registry/Registry.java b/api/src/main/java/de/bauhd/sculk/registry/Registry.java similarity index 97% rename from api/src/main/java/de/bauhd/minecraft/server/registry/Registry.java rename to api/src/main/java/de/bauhd/sculk/registry/Registry.java index 9d2bfe4f..7b6b829a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/registry/Registry.java +++ b/api/src/main/java/de/bauhd/sculk/registry/Registry.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.registry; +package de.bauhd.sculk.registry; import net.kyori.adventure.key.Key; import net.kyori.adventure.key.Keyed; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/Position.java b/api/src/main/java/de/bauhd/sculk/world/Position.java similarity index 98% rename from api/src/main/java/de/bauhd/minecraft/server/world/Position.java rename to api/src/main/java/de/bauhd/sculk/world/Position.java index a70ec929..59ae2907 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/Position.java +++ b/api/src/main/java/de/bauhd/sculk/world/Position.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world; +package de.bauhd.sculk.world; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/World.java b/api/src/main/java/de/bauhd/sculk/world/World.java similarity index 91% rename from api/src/main/java/de/bauhd/minecraft/server/world/World.java rename to api/src/main/java/de/bauhd/sculk/world/World.java index 7d8526c7..25f2e13c 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/World.java +++ b/api/src/main/java/de/bauhd/sculk/world/World.java @@ -1,12 +1,12 @@ -package de.bauhd.minecraft.server.world; - -import de.bauhd.minecraft.server.entity.Entity; -import de.bauhd.minecraft.server.entity.player.GameMode; -import de.bauhd.minecraft.server.world.block.BlockState; -import de.bauhd.minecraft.server.world.chunk.Chunk; -import de.bauhd.minecraft.server.world.chunk.ChunkGenerator; -import de.bauhd.minecraft.server.world.chunk.VoidGenerator; -import de.bauhd.minecraft.server.world.dimension.Dimension; +package de.bauhd.sculk.world; + +import de.bauhd.sculk.entity.Entity; +import de.bauhd.sculk.entity.player.GameMode; +import de.bauhd.sculk.world.block.BlockState; +import de.bauhd.sculk.world.chunk.Chunk; +import de.bauhd.sculk.world.chunk.ChunkGenerator; +import de.bauhd.sculk.world.chunk.VoidGenerator; +import de.bauhd.sculk.world.dimension.Dimension; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/biome/Biome.java b/api/src/main/java/de/bauhd/sculk/world/biome/Biome.java similarity index 98% rename from api/src/main/java/de/bauhd/minecraft/server/world/biome/Biome.java rename to api/src/main/java/de/bauhd/sculk/world/biome/Biome.java index fbc15183..44ceada1 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/biome/Biome.java +++ b/api/src/main/java/de/bauhd/sculk/world/biome/Biome.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.biome; +package de.bauhd.sculk.world.biome; -import de.bauhd.minecraft.server.registry.Registry; +import de.bauhd.sculk.registry.Registry; import net.kyori.adventure.key.Key; import net.kyori.adventure.nbt.CompoundBinaryTag; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/block/Block.java b/api/src/main/java/de/bauhd/sculk/world/block/Block.java similarity index 99% rename from api/src/main/java/de/bauhd/minecraft/server/world/block/Block.java rename to api/src/main/java/de/bauhd/sculk/world/block/Block.java index 4084686c..7ced5640 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/block/Block.java +++ b/api/src/main/java/de/bauhd/sculk/world/block/Block.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.block; +package de.bauhd.sculk.world.block; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/block/BlockState.java b/api/src/main/java/de/bauhd/sculk/world/block/BlockState.java similarity index 98% rename from api/src/main/java/de/bauhd/minecraft/server/world/block/BlockState.java rename to api/src/main/java/de/bauhd/sculk/world/block/BlockState.java index ead4021f..e6f33977 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/block/BlockState.java +++ b/api/src/main/java/de/bauhd/sculk/world/block/BlockState.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.block; +package de.bauhd.sculk.world.block; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/block/Blocks.java b/api/src/main/java/de/bauhd/sculk/world/block/Blocks.java similarity index 93% rename from api/src/main/java/de/bauhd/minecraft/server/world/block/Blocks.java rename to api/src/main/java/de/bauhd/sculk/world/block/Blocks.java index 0fed7320..19ebf67a 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/block/Blocks.java +++ b/api/src/main/java/de/bauhd/sculk/world/block/Blocks.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.block; +package de.bauhd.sculk.world.block; import org.jetbrains.annotations.ApiStatus; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/chunk/Chunk.java b/api/src/main/java/de/bauhd/sculk/world/chunk/Chunk.java similarity index 88% rename from api/src/main/java/de/bauhd/minecraft/server/world/chunk/Chunk.java rename to api/src/main/java/de/bauhd/sculk/world/chunk/Chunk.java index b0c5ea46..84a8e802 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/chunk/Chunk.java +++ b/api/src/main/java/de/bauhd/sculk/world/chunk/Chunk.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.world.chunk; +package de.bauhd.sculk.world.chunk; -import de.bauhd.minecraft.server.world.biome.Biome; -import de.bauhd.minecraft.server.world.block.BlockState; +import de.bauhd.sculk.world.biome.Biome; +import de.bauhd.sculk.world.block.BlockState; import org.jetbrains.annotations.NotNull; /** diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/chunk/ChunkGenerator.java b/api/src/main/java/de/bauhd/sculk/world/chunk/ChunkGenerator.java similarity index 85% rename from api/src/main/java/de/bauhd/minecraft/server/world/chunk/ChunkGenerator.java rename to api/src/main/java/de/bauhd/sculk/world/chunk/ChunkGenerator.java index 84c4b73f..8c4fb98e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/chunk/ChunkGenerator.java +++ b/api/src/main/java/de/bauhd/sculk/world/chunk/ChunkGenerator.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.chunk; +package de.bauhd.sculk.world.chunk; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/chunk/VoidGenerator.java b/api/src/main/java/de/bauhd/sculk/world/chunk/VoidGenerator.java similarity index 86% rename from api/src/main/java/de/bauhd/minecraft/server/world/chunk/VoidGenerator.java rename to api/src/main/java/de/bauhd/sculk/world/chunk/VoidGenerator.java index 9c962979..6fdd146e 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/chunk/VoidGenerator.java +++ b/api/src/main/java/de/bauhd/sculk/world/chunk/VoidGenerator.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.chunk; +package de.bauhd.sculk.world.chunk; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/java/de/bauhd/minecraft/server/world/dimension/Dimension.java b/api/src/main/java/de/bauhd/sculk/world/dimension/Dimension.java similarity index 98% rename from api/src/main/java/de/bauhd/minecraft/server/world/dimension/Dimension.java rename to api/src/main/java/de/bauhd/sculk/world/dimension/Dimension.java index 57271b9c..d139929c 100644 --- a/api/src/main/java/de/bauhd/minecraft/server/world/dimension/Dimension.java +++ b/api/src/main/java/de/bauhd/sculk/world/dimension/Dimension.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.world.dimension; +package de.bauhd.sculk.world.dimension; -import de.bauhd.minecraft.server.registry.Registry; -import de.bauhd.minecraft.server.world.chunk.Chunk; +import de.bauhd.sculk.registry.Registry; +import de.bauhd.sculk.world.chunk.Chunk; import net.kyori.adventure.key.Key; import net.kyori.adventure.nbt.CompoundBinaryTag; import org.jetbrains.annotations.NotNull; diff --git a/api/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/api/src/main/resources/META-INF/services/javax.annotation.processing.Processor index d69fcc8d..f485ebf5 100644 --- a/api/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/api/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1 +1 @@ -de.bauhd.minecraft.server.plugin.PluginAnnotationProcessor \ No newline at end of file +de.bauhd.sculk.plugin.PluginAnnotationProcessor \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index a329b8f7..19a792e1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,13 +5,13 @@ plugins { defaultTasks("build", "test", "shadowJar") allprojects { - group = "de.bauhd.minecraft.server" + group = "de.bauhd.sculk" version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven("https://libraries.minecraft.net") + maven("https://libraries.minecraft.net") // for brigadier } } diff --git a/code-generator/src/main/java/de/bauhd/minecraft/code/generator/CodeGenerator.java b/code-generator/src/main/java/de/bauhd/sculk/code/generator/CodeGenerator.java similarity index 91% rename from code-generator/src/main/java/de/bauhd/minecraft/code/generator/CodeGenerator.java rename to code-generator/src/main/java/de/bauhd/sculk/code/generator/CodeGenerator.java index 0163fa63..2651edb1 100644 --- a/code-generator/src/main/java/de/bauhd/minecraft/code/generator/CodeGenerator.java +++ b/code-generator/src/main/java/de/bauhd/sculk/code/generator/CodeGenerator.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.code.generator; +package de.bauhd.sculk.code.generator; import com.google.gson.Gson; import com.google.gson.JsonObject; @@ -11,6 +11,7 @@ import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.function.Consumer; @@ -21,19 +22,26 @@ public final class CodeGenerator { private static final Type STRING_JSON_MAP = TypeToken.getParameterized(Map.class, String.class, JsonObject.class).getType(); public static void main(String[] args) throws IOException { - final var path = Path.of("generated"); - if (Files.notExists(path)) { - System.err.println("generated directory not found."); - return; + final var tmp = Path.of("tmp"); + Files.createDirectory(tmp); + new DataGenerator(tmp); + + new CodeGenerator().generate(tmp.resolve("generated")); + try (final var stream = Files.walk(tmp).sorted(Comparator.reverseOrder())) { + stream.forEach(path -> { + try { + Files.delete(path); + } catch (IOException e) { + throw new RuntimeException(e); + } + }); } - - new CodeGenerator().generate(path); } private void generate(final Path generated) throws IOException { final var reports = generated.resolve("reports"); final var data = generated.resolve("data").resolve("minecraft"); - final var apiPackage = Path.of("api", "src", "main", "java", "de", "bauhd", "minecraft", "server"); + final var apiPackage = Path.of("api", "src", "main", "java", "de", "bauhd", "sculk"); try (final var reader = Files.newBufferedReader(reports.resolve("blocks.json"))) { this.generateBlocks(reader, apiPackage.resolve("world").resolve("block").resolve("Block.java")); @@ -62,7 +70,7 @@ private void generate(final Path generated) throws IOException { final var entityTypePath = entityPath.resolve(name + ".java"); if (Files.notExists(entityTypePath)) { try (final var writer = Files.newBufferedWriter(entityTypePath)) { - writer.write("package de.bauhd.minecraft.server.entity;\n"); + writer.write("package de.bauhd.sculk.entity;\n"); writer.write("\n"); writer.write("public interface " + name + " extends Entity {}"); } catch (IOException e) { diff --git a/code-generator/src/main/java/de/bauhd/sculk/code/generator/DataGenerator.java b/code-generator/src/main/java/de/bauhd/sculk/code/generator/DataGenerator.java new file mode 100644 index 00000000..c0805093 --- /dev/null +++ b/code-generator/src/main/java/de/bauhd/sculk/code/generator/DataGenerator.java @@ -0,0 +1,42 @@ +package de.bauhd.sculk.code.generator; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.function.Consumer; + +public final class DataGenerator { + + private final StringBuffer stringBuffer = new StringBuffer(); + private final byte[] bytes = new byte[2048]; + + public DataGenerator(Path tmp) throws IOException { + final var process = new ProcessBuilder("java", "-DbundlerMainClass=net.minecraft.data.Main", "-jar", "../server.jar", + "--reports", "--server") + .directory(tmp.toFile()).start(); + + final Consumer error = System.err::println; + final Consumer input = System.out::println; + while (process.isAlive()) { + this.readStream(process.getErrorStream(), error); + this.readStream(process.getInputStream(), input); + } + } + + private void readStream(final InputStream stream, final Consumer consumer) throws IOException { + var length = 0; + while (stream.available() > 0 && (length = stream.read(this.bytes, 0, this.bytes.length)) != -1) { + this.stringBuffer.append(new String(this.bytes, 0, length, StandardCharsets.UTF_8)); + } + final var string = this.stringBuffer.toString(); + if (string.contains("\n")) { + for (final var text : string.split("\n")) { + if (!text.trim().isEmpty()) { + consumer.accept(text); + } + } + } + this.stringBuffer.setLength(0); + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 233e00a0..d67d04a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -netty = "5.0.0.Alpha5" +netty = "4.1.97.Final" adventure = "4.14.0" log4j = "2.20.0" @@ -7,9 +7,9 @@ log4j = "2.20.0" shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" } [libraries] -netty-codec = { group = "io.netty", name = "netty5-codec", version.ref = "netty" } -netty-transport = { group = "io.netty", name = "netty5-transport", version.ref = "netty" } -netty-transport-epoll = { group = "io.netty", name = "netty5-transport-native-epoll", version.ref = "netty" } +netty-codec = { group = "io.netty", name = "netty-codec", version.ref = "netty" } +netty-transport = { group = "io.netty", name = "netty-transport", version.ref = "netty" } +netty-transport-epoll = { group = "io.netty", name = "netty-transport-native-epoll", version.ref = "netty" } adventure-api = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" } adventure-nbt = { group = "net.kyori", name = "adventure-nbt", version.ref = "adventure" } @@ -31,6 +31,7 @@ jansi = "org.fusesource.jansi:jansi:2.4.0" fastutil = "it.unimi.dsi:fastutil-core:8.5.12" gson = "com.google.code.gson:gson:2.10.1" brigadier = "com.mojang:brigadier:1.0.18" +velocity-native = "com.velocitypowered:velocity-native:3.2.0-SNAPSHOT" junit = "org.junit.jupiter:junit-jupiter:5.10.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7710deaf9f98673a68957ea02138b60d0a..c1962a79e29d3e0ab67b14947c167a862655af9b 100644 GIT binary patch delta 8979 zcmY*fV{{$d(moANW81db*tXT!Nn`UgX2ZtD$%&n`v2C-lt;YD?@2-14?EPcUv!0n* z`^Ws4HP4i8L%;4p*JkD-J9ja2aKi!sX@~#-MY5?EPBK~fXAl)Ti}^QGH@6h+V+|}F zv=1RqQxhWW9!hTvYE!)+*m%jEL^9caK;am9X8QP~a9X0N6(=WSX8KF#WpU-6TjyR3 zpKhscivP97d$DGc{KI(f#g07u{Jr0wn#+qNr}yW}2N3{Kx0lCq%p4LBKil*QDTEyR zg{{&=GAy_O0VJ(8ZbtS4tPeeeILKK(M?HtQY!6K^wt zxsPH>E%g%V@=!B;kWF54$xjC&4hO!ZEG0QFMHLqe!tgH;%vO62BQj||nokbX&2kxF zzg#N!2M|NxFL#YdwOL8}>iDLr%2=!LZvk_&`AMrm7Zm%#_{Ot_qw=HkdVg{f9hYHF zlRF*9kxo~FPfyBD!^d6MbD?BRZj(4u9j!5}HFUt+$#Jd48Fd~ahe@)R9Z2M1t%LHa z_IP|tDb0CDl(fsEbvIYawJLJ7hXfpVw)D-)R-mHdyn5uZYefN0rZ-#KDzb`gsow;v zGX>k|g5?D%Vn_}IJIgf%nAz{@j0FCIEVWffc1Z+lliA}L+WJY=MAf$GeI7xw5YD1) z;BJn$T;JI5vTbZ&4aYfmd-XPQd)YQ~d({>(^5u>Y^5rfxEUDci9I5?dXp6{zHG=Tc z6$rLd^C~60=K4ptlZ%Fl-%QLc-x{y=zU$%&4ZU}4&Yu?jF4eqB#kTHhty`Aq=kJE% zzq(5OS9o1t-)}S}`chh1Uu-Sl?ljxMDVIy5j`97Eqg7L~Ak9NSZ?!5M>5TRMXfD#} zFlMmFnr%?ra>vkvJQjmWa8oB{63qPo1L#LAht%FG|6CEe9KP2&VNe_HNb7M}pd*!t zpGL0vzCU02%iK@AKWxP^64fz-U#%u~D+FV?*KdPY9C_9{Ggn;Y;;iKE0b|}KmC&f(WIDcFtvRPDju z?Dc&_dP4*hh!%!6(nYB*TEJs<4zn*V0Nw1O4VzYaNZul>anE2Feb@T$XkI?)u6VK$bg* z22AY7|Ju!_jwc2@JX(;SUE>VDWRD|d56WYUGLAAwPYXU9K&NgY{t{dyMskUBgV%@p zMVcFn>W|hJA?3S?$k!M|1S2e1A&_~W2p$;O2Wpn`$|8W(@~w>RR4kxHdEr`+q|>m@ zTYp%Ut+g`T#HkyE5zw<5uhFvt2=k5fM3!8OxvGgMRS|t7RaJn7!2$r_-~a%C7@*Dq zGUp2g0N^HzLU=%bROVFi2J;#`7#WGTUI$r!(wmbJlbS`E#ZpNp7vOR#TwPQWNf$IW zoX>v@6S8n6+HhUZB7V^A`Y9t4ngdfUFZrDOayMVvg&=RY4@0Z~L|vW)DZTIvqA)%D zi!pa)8L7BipsVh5-LMH4bmwt2?t88YUfIRf!@8^gX$xpKTE^WpM!-=3?UVw^Cs`Y7 z2b<*~Q=1uqs79{h&H_8+X%><4qSbz_cSEa;Hkdmtq5uwGTY+|APD{i_zYhLXqT7HO zT^Am_tW?Cmn%N~MC0!9mYt-~WK;hj-SnayMwqAAHo#^ALwkg0>72&W}5^4%|Z|@T; zwwBQTg*&eXC}j8 zra77(XC^p&&o;KrZ$`_)C$@SDWT+p$3!;ZB#yhnK{CxQc&?R}ZQMcp`!!eXLLhiP8W zM=McHAMnUMlar8XLXk&jx#HBH3U0jbhJuqa~#l`aB)N6;WI(Im322o#{K&92l6(K z)(;=;-m!%9@j#WSA1uniU(^x(UTi+%idMd)x*!*Hub0Rg7DblI!cqo9QUZf29Y#?XN!K!|ovJ7~!^H}!zsaMl(57lpztQ7V zyo#`qJ4jv1zGAW2uIkU3o&7_=lYWz3=SR!sgfuYp{Um<*H%uW8MdUT2&o*QKjD3PEH zHz;H}qCN~`GFsJ_xz$9xga*@VzJTH7-3lggkBM&7xlz5#qWfkgi=#j%{&f-NMsaSv zeIZ60Jpw}QV+t`ovOJxVhYCXe8E7r*eLCJ{lP6sqc}BYrhjXlt(6e9nw=2Le1gOT0 zZX!q9r#DZ&8_cAhWPeq~CJkGvpRU&q8>rR@RBW4~@3j1X>RBum#U z1wjcEdB`|@sXAWxk2*TOj> zr(j{nr1;Mk3x^gvAtZsahY=ou{eAJi-d(XISF-?+Q6{Um4+lu?aA=S33@k=6^OT?F z8TE`ha;q@=ZQ-dlt!q49;Wjjl<&Yee^!h5MFkd)Oj=fsvxytK%!B z-P#YJ)8^dMi=wpKmt43|apX6v2dNXzZ-WHlLEh`JoKFNjCK7LhO^P5XW?Y~rjGcIpv$2v41rE}~0{aj9NVpDXGdD6W8{fyzioQdu&xkn8 zhT*^NY0zv>Om?h3XAku3p-4SHkK@fXrpi{T=@#bwY76TsD4$tAHAhXAStdb$odc z02~lZyb!fG_7qrU_F5 zoOG|pEwdyDhLXDwlU>T|;LF@ACJk(qZ*2h6GB@33mKk};HO^CQM(N7@Ml5|8IeHzt zdG4f$q}SNYA4P=?jV!mJ%3hRKwi&!wFptWZRq4bpV9^b7&L>nW%~Y|junw!jHj%85 z3Ck6%`Y=Abvrujnm{`OtE0uQkeX@3JPzj#iO#eNoAX6cDhM+cc2mLk8;^bG62mtjQ zj|kxI2W|4n{VqMqB?@YnA0y}@Mju)&j3UQ4tSdH=Eu?>i7A50b%i$pc{YJki7ubq7 zVTDqdkGjeAuZdF)KBwR6LZob}7`2935iKIU2-I;88&?t16c-~TNWIcQ8C_cE_F1tv z*>4<_kimwX^CQtFrlk)i!3-+2zD|=!D43Qqk-LtpPnX#QQt%eullxHat97k=00qR|b2|M}`q??yf+h~};_PJ2bLeEeteO3rh+H{9otNQDki^lu)(`a~_x(8NWLE*rb%T=Z~s?JC|G zXNnO~2SzW)H}p6Zn%WqAyadG=?$BXuS(x-2(T!E&sBcIz6`w=MdtxR<7M`s6-#!s+ znhpkcNMw{c#!F%#O!K*?(Hl(;Tgl9~WYBB(P@9KHb8ZkLN>|}+pQ)K#>ANpV1IM{Q z8qL^PiNEOrY*%!7Hj!CwRT2CN4r(ipJA%kCc&s;wOfrweu)H!YlFM z247pwv!nFWbTKq&zm4UVH^d?H2M276ny~@v5jR2>@ihAmcdZI-ah(&)7uLQM5COqg?hjX2<75QU4o5Q7 zZ5gG;6RMhxLa5NFTXgegSXb0a%aPdmLL4=`ox2smE)lDn^!;^PNftzTf~n{NH7uh_ zc9sKmx@q1InUh_BgI3C!f>`HnO~X`9#XTI^Yzaj1928gz8ClI!WIB&2!&;M18pf0T zsZ81LY3$-_O`@4$vrO`Cb&{apkvUwrA0Z49YfZYD)V4;c2&`JPJuwN_o~2vnyW_b! z%yUSS5K{a*t>;WJr&$A_&}bLTTXK23<;*EiNHHF-F<#hy8v2eegrqnE=^gt+|8R5o z_80IY4&-!2`uISX6lb0kCVmkQ{D}HMGUAkCe`I~t2~99(<#}{E;{+Y0!FU>leSP(M zuMoSOEfw3OC5kQ~Y2)EMlJceJlh}p?uw}!cq?h44=b2k@T1;6KviZGc_zbeTtTE$@EDwUcjxd#fpK=W*U@S#U|YKz{#qbb*|BpcaU!>6&Ir zhsA+ywgvk54%Nj>!!oH>MQ+L~36v1pV%^pOmvo7sT|N}$U!T6l^<3W2 z6}mT7Cl=IQo%Y~d%l=+;vdK)yW!C>Es-~b^E?IjUU4h6<86tun6rO#?!37B)M8>ph zJ@`~09W^@5=}sWg8`~ew=0>0*V^b9eG=rBIGbe3Ko$pj!0CBUTmF^Q}l7|kCeB(pX zi6UvbUJWfKcA&PDq?2HrMnJBTW#nm$(vPZE;%FRM#ge$S)i4!y$ShDwduz@EPp3H? z`+%=~-g6`Ibtrb=QsH3w-bKCX1_aGKo4Q7n-zYp->k~KE!(K@VZder&^^hIF6AhiG z;_ig2NDd_hpo!W1Un{GcB@e{O@P3zHnj;@SzYCxsImCHJS5I&^s-J6?cw92qeK8}W zk<_SvajS&d_tDP~>nhkJSoN>UZUHs?)bDY`{`;D^@wMW0@!H1I_BYphly0iqq^Jp; z_aD>eHbu@e6&PUQ4*q*ik0i*$Ru^_@`Mbyrscb&`8|c=RWZ>Ybs16Q?Cj1r6RQA5! zOeuxfzWm(fX!geO(anpBCOV|a&mu|$4cZ<*{pb1F{`-cm1)yB6AGm7b=GV@r*DataJ^I!>^lCvS_@AftZiwtpszHmq{UVl zKL9164tmF5g>uOZ({Jg~fH~QyHd#h#E;WzSYO~zt)_ZMhefdm5*H1K-#=_kw#o%ch zgX|C$K4l4IY8=PV6Q{T8dd`*6MG-TlsTEaA&W{EuwaoN+-BDdSL2>|lwiZ++4eR8h zNS1yJdbhAWjW4k`i1KL)l#G*Y=a0ouTbg8R1aUU`8X7p*AnO+uaNF9mwa+ooA)hlj zR26XBpQ-{6E9;PQAvq2<%!M1;@Q%r@xZ16YRyL&v}9F`Nnx#RLUc<78w$S zZElh==Rnr2u<*qKY|aUR9(A|{cURqP81O-1a@X)khheokEhC}BS-g~|zRbn-igmID z$Ww!O0-j!t(lx>-JH+0KW3*Bgafpm>%n=`(ZLa^TWd*-je!Xi7H*bZ8pz`HPFYeC? zk>`W)4Cj6*A3A8g$MEhp*<@qO&&>3<4YI%0YAMmQvD3 z${78Fa2mqiI>P7|gE)xs$cg3~^?UBb4y6B4Z#0Fzy zN8Gf!c+$uPS`VRB=wRV1f)>+PEHBYco<1?ceXET}Q-tKI=E`21<15xTe@%Bhk$v09 zVpoL_wNuw)@^O+C@VCeuWM}(%C(%lTJ}7n)JVV!^0H!3@)ydq#vEt;_*+xos$9i?{ zCw5^ZcNS&GzaeBmPg6IKrbT`OSuKg$wai+5K}$mTO-Z$s3Y+vb3G}x%WqlnQS1;|Z zlZ$L{onq1Ag#5JrM)%6~ToQ}NmM2A(7X5gy$nVI=tQFOm;7|Oeij{xb_KU{d@%)2z zsVqzTl@XPf(a95;P;oBm9Hlpo`9)D9>G>!Bj=ZmX{ces=aC~E^$rTO5hO$#X65jEA zMj1(p+HXdOh7FAV;(_)_RR#P>&NW?&4C7K1Y$C$i**g;KOdu|JI_Ep zV-N$wuDRkn6=k|tCDXU%d=YvT!M1nU?JY;Pl`dxQX5+660TX7~q@ukEKc!Iqy2y)KuG^Q-Y%$;SR&Mv{%=CjphG1_^dkUM=qI*3Ih^Bk621n`6;q(D;nB_y|~ zW*1ps&h|wcET!#~+Ptsiex~YVhDiIREiw1=uwlNpPyqDZ`qqv9GtKwvxnFE}ME93fD9(Iq zz=f&4ZpD~+qROW6Y2AjPj9pH*r_pS_f@tLl88dbkO9LG0+|4*Xq(Eo7fr5MVg{n<+p>H{LGr}UzToqfk_x6(2YB~-^7>%X z+331Ob|NyMST64u|1dK*#J>qEW@dKNj-u}3MG)ZQi~#GzJ_S4n5lb7vu&>;I-M49a z0Uc#GD-KjO`tQ5ftuSz<+`rT)cLio$OJDLtC`t)bE+Nu@Rok2;`#zv1=n z7_CZr&EhVy{jq(eJPS)XA>!7t<&ormWI~w0@Y#VKjK)`KAO~3|%+{ z$HKIF?86~jH*1p=`j#}8ON0{mvoiN7fS^N+TzF~;9G0_lQ?(OT8!b1F8a~epAH#uA zSN+goE<-psRqPXdG7}w=ddH=QAL|g}x5%l-`Kh69D4{M?jv!l))<@jxLL$Eg2vt@E zc6w`$?_z%awCE~ca)9nMvj($VH%2!?w3c(5Y4&ZC2q#yQ=r{H2O839eoBJ{rfMTs8 zn2aL6e6?;LY#&(BvX_gC6uFK`0yt zJbUATdyz5d3lRyV!rwbj0hVg#KHdK0^A7_3KA%gKi#F#-^K%1XQbeF49arI2LA|Bj z?=;VxKbZo(iQmHB5eAg=8IPRqyskQNR!&KEPrGv&kMr(8`4oe?vd?sIZJK+JY04kc zXWk)4N|~*|0$4sUV3U6W6g+Z3;nN<~n4H17QT*%MCLt_huVl@QkV`A`jyq<|q=&F_ zPEOotTu9?zGKaPJ#9P&ljgW!|Vxhe+l85%G5zpD5kAtn*ZC})qEy!v`_R}EcOn)&# z-+B52@Zle@$!^-N@<_=LKF}fqQkwf1rE(OQP&8!En}jqr-l0A0K>77K8{zT%wVpT~ zMgDx}RUG$jgaeqv*E~<#RT?Q)(RGi8bUm(1X?2OAG2!LbBR+u1r7$}s=lKqu&VjXP zUw3L9DH({yj)M%OqP%GC+$}o0iG|*hN-Ecv3bxS|Mxpmz*%x`w7~=o9BKfEVzr~K- zo&Fh`wZ{#1Jd5QFM4&!PabL!tf%TfJ4wi;45AqWe$x}8*c2cgqua`(6@ErE&P{K5M zQfwGQ4Qg&M3r4^^$B?_AdLzqtxn5nb#kItDY?BTW z#hShspeIDJ1FDmfq@dz1TT`OV;SS0ImUp`P6GzOqB3dPfzf?+w^40!Wn*4s!E;iHW zNzpDG+Vmtnh%CyfAX>X z{Y=vt;yb z;TBRZpw##Kh$l<8qq5|3LkrwX%MoxqWwclBS6|7LDM(I31>$_w=;{=HcyWlak3xM1 z_oaOa)a;AtV{*xSj6v|x%a42{h@X-cr%#HO5hWbuKRGTZS)o=^Id^>H5}0p_(BEXX zx3VnRUj6&1JjDI);c=#EYcsg;D5TFlhe)=nAycR1N)YSHQvO+P5hKe9T0ggZT{oF@ z#i3V4TpQlO1A8*TWn|e}UWZ(OU;Isd^ zb<#Vj`~W_-S_=lDR#223!xq8sRjAAVSY2MhRyUyHa-{ql=zyMz?~i_c&dS>eb>s>#q#$UI+!&6MftpQvxHA@f|k2(G9z zAQCx-lJ-AT;PnX%dY5}N$m6tFt5h6;Mf78TmFUN9#4*qBNg4it3-s22P+|Rw zG@X%R0sm*X07ZZEOJRbDkcjr}tvaVWlrwJ#7KYEw&X`2lDa@qb!0*SHa%+-FU!83q zY{R15$vfL56^Nj42#vGQlQ%coT4bLr2s5Y0zBFp8u&F(+*%k4xE1{s75Q?P(SL7kf zhG?3rfM9V*b?>dOpwr%uGH7Xfk1HZ!*k`@CNM77g_mGN=ucMG&QX19B!%y77w?g#b z%k3x6q_w_%ghL;9Zk_J#V{hxK%6j`?-`UN?^e%(L6R#t#97kZaOr1{&<8VGVs1O>} z6~!myW`ja01v%qy%WI=8WI!cf#YA8KNRoU>`_muCqpt_;F@rkVeDY}F7puI_wBPH9 zgRGre(X_z4PUO5!VDSyg)bea1x_a7M z4AJ?dd9rf{*P`AY+w?g_TyJlB5Nks~1$@PxdtpUGGG##7j<$g&BhKq0mXTva{;h5E ztcN!O17bquKEDC#;Yw2yE>*=|WdZT9+ycgUR^f?~+TY-E552AZlzYn{-2CLRV9mn8 z+zNoWLae^P{co`F?)r;f!C=nnl*1+DI)mZY!frp~f%6tX2g=?zQL^d-j^t1~+xYgK zv;np&js@X=_e7F&&ZUX|N6Q2P0L=fWoBuh*L7$3~$-A)sdy6EQ@Pd-)|7lDA@%ra2 z4jL@^w92&KC>H(=v2j!tVE_3w0KogtrNjgPBsTvW F{TFmrHLU;u delta 8469 zcmY*q~ZGqoW{=01$bgB@1Nex`%9%S2I04)5Jw9+UyLS&r+9O2bq{gY;dCa zHW3WY0%Dem?S7n5JZO%*yiT9fb!XGk9^Q`o-EO{a^j%&)ZsxsSN@2k2eFx1*psqn0e*crIbAO}Rd~_BifMu*q7SUn{>WD$=7n_$uiQ0wGc$?u1hM%gf??nL?m22h!8{ zYmFMLvx6fjz*nwF^tAqx1uv0yEW9-tcIV5Q{HNh`9PMsuqD8VE%oAs5FsWa0mLV$L zPAF5e^$tJ8_Kwp!$N1M<#Z154n!X6hFpk8)eMLu; zaXS71&`24 zV`x~}yAxBw##Oj@qo_@DcBqc+2TB&=bJyZWTeR55zG<{Z@T^hSbMdm~Ikkr?4{7WT zcjPyu>0sDjl7&?TL@ z)cW?lW@Pfwu#nm7E1%6*nBIzQrKhHl`t54$-m>j8f%0vVr?N0PTz`}VrYAl+8h^O~ zuWQj@aZSZmGPtcVjGq-EQ1V`)%x{HZ6pT-tZttJOQm?q-#KzchbH>>5-jEX*K~KDa z#oO&Qf4$@}ZGQ7gxn<;D$ziphThbi6zL^YC;J#t0GCbjY)NHdqF=M4e(@|DUPY_=F zLcX1HAJ+O-3VkU#LW`4;=6szwwo%^R4#UK}HdAXK` z{m!VZj5q9tVYL=^TqPH*6?>*yr>VxyYF4tY{~?qJ*eIoIU0}-TLepzga4g}}D7#Qu zn;6I;l!`xaL^8r*Tz*h`^(xJCnuVR_O@Gl*Q}y$lp%!kxD`%zN19WTIf`VX*M=cDp z*s4<9wP|ev;PARRV`g$R*QV@rr%Ku~z(2-s>nt{JI$357vnFAz9!ZsiiH#4wOt+!1 zM;h;EN__zBn)*-A^l!`b?b*VI-?)Sj6&Ov3!j9k$5+#w)M>`AExCm0!#XL+E{Bp)s;Hochs+-@@)7_XDMPby#p<9mLu+S{8e2Jn`1`1nrffBfy4u)p7FFQWzgYt zXC}GypRdkTUS+mP!jSH$K71PYI%QI-{m;DvlRb*|4GMPmvURv0uD2bvS%FOSe_$4zc--*>gfRMKN|D ztP^WFfGEkcm?sqXoyRmuCgb?bSG17#QSv4~XsbPH>BE%;bZQ_HQb?q%CjykL7CWDf z!rtrPk~46_!{V`V<;AjAza;w-F%t1^+b|r_um$#1cHZ1|WpVUS&1aq?Mnss|HVDRY z*sVYNB+4#TJAh4#rGbr}oSnxjD6_LIkanNvZ9_#bm?$HKKdDdg4%vxbm-t@ZcKr#x z6<$$VPNBpWM2S+bf5IBjY3-IY2-BwRfW_DonEaXa=h{xOH%oa~gPW6LTF26Y*M)$N z=9i`Y8};Qgr#zvU)_^yU5yB;9@yJjrMvc4T%}a|jCze826soW-d`V~eo%RTh)&#XR zRe<8$42S2oz|NVcB%rG(FP2U&X>3 z4M^}|K{v64>~rob;$GO55t;Nb&T+A3u(>P6;wtp6DBGWbX|3EZBDAM2DCo&4w|WGpi;~qUY?Ofg$pX&`zR~)lr)8}z^U3U38Nrtnmf~e7$i=l>+*R%hQgDrj%P7F zIjyBCj2$Td=Fp=0Dk{=8d6cIcW6zhK!$>k*uC^f}c6-NR$ zd<)oa+_fQDyY-}9DsPBvh@6EvLZ}c)C&O-+wY|}RYHbc2cdGuNcJ7#yE}9=!Vt-Q~ z4tOePK!0IJ0cW*jOkCO? zS-T!bE{5LD&u!I4tqy;dI*)#e^i)uIDxU?8wK1COP3Qk{$vM3Sm8(F2VwM?1A+dle z6`M6bbZye|kew%w9l`GS74yhLluJU5R=#!&zGwB7lmTt}&eCt0g(-a;Mom-{lL6u~ zFgjyUs1$K*0R51qQTW_165~#WRrMxiUx{0F#+tvgtcjV$U|Z}G*JWo6)8f!+(4o>O zuaAxLfUl;GHI}A}Kc>A8h^v6C-9bb}lw@rtA*4Q8)z>0oa6V1>N4GFyi&v69#x&CwK*^!w&$`dv zQKRMKcN$^=$?4to7X4I`?PKGi(=R}d8cv{74o|9FwS zvvTg0D~O%bQpbp@{r49;r~5`mcE^P<9;Zi$?4LP-^P^kuY#uBz$F!u1d{Ens6~$Od zf)dV+8-4!eURXZZ;lM4rJw{R3f1Ng<9nn2_RQUZDrOw5+DtdAIv*v@3ZBU9G)sC&y!vM28daSH7(SKNGcV z&5x#e#W2eY?XN@jyOQiSj$BlXkTG3uAL{D|PwoMp$}f3h5o7b4Y+X#P)0jlolgLn9xC%zr3jr$gl$8?II`DO6gIGm;O`R`bN{;DlXaY4b`>x6xH=Kl@ z!>mh~TLOo)#dTb~F;O z8hpjW9Ga?AX&&J+T#RM6u*9x{&%I8m?vk4eDWz^l2N_k(TbeBpIwcV4FhL(S$4l5p z@{n7|sax){t!3t4O!`o(dYCNh90+hl|p%V_q&cwBzT*?Nu*D0wZ)fPXv z@*;`TO7T0WKtFh8~mQx;49VG_`l`g|&VK}LysK%eU4})Cvvg3YN)%;zI?;_Nr z)5zuU1^r3h;Y+mJov*->dOOj>RV^u2*|RraaQWsY5N?Uu)fKJOCSL2^G=RB%(4K{* zx!^cB@I|kJR`b+5IK}(6)m=O{49P5E^)!XvD5zVuzJH{01^#$@Cn514w41BB;FAoS2SYl3SRrOBDLfl5MvgA3 zU6{T?BW}l~8vU;q@p9IOM(=;WdioeQmt?X|=L9kyM&ZsNc*-Knv8@U*O96T@4ZiJ$ zeFL2}pw_~Tm3d4#q!zZS0km@vYgym33C0h(6D)6|Y)*UXI^T`(QPQh$WF?&h(3QYh zqGw@?BTk@VA_VxK@z?a@UrMhY zUD16oqx4$$6J_k0HnXgARm}N#(^yA1MLdbwmEqHnX*JdHN>$5k2E|^_bL< zGf5Z+D!9dXR>^(5F&5gIew1%kJtFUwI5P1~I$4LL_6)3RPzw|@2vV;Q^MeQUKzc=KxSTTX`}u%z?h~;qI#%dE@OZwehZyDBsWTc&tOC1c%HS#AyTJ= zQixj=BNVaRS*G!;B$}cJljeiVQabC25O+xr4A+32HVb;@+%r}$^u4-R?^3yij)0xb z86i@aoVxa%?bfOE;Bgvm&8_8K(M-ZEj*u9ms_Hk#2eL`PSnD#At!0l{f!v`&Kg}M$n(&R)?AigC5Z?T7Jv^lrDL!yYS{4 zq_H}oezX-Svu>dp)wE@khE@aR5vY=;{C-8Hws++5LDpArYd)U47jc-;f~07_TPa^1 zO`0+uIq)@?^!%JXCDid+nt|c@NG1+ce@ijUX&@rV9UiT|m+t-nqVB7?&UX*|{yDBFw9x52&dTh@;CL)Q?6s1gL=CUQTX7#TJPs9cpw<4>GFMUKo|f{! z&(%2hP6ghr%UFVO-N^v9l|tKy>&e%8us}wT0N*l(tezoctVtLmNdGPOF6oaAGJI5R zZ*|k@z3H!~Mm9fXw{bbP6?lV-j#Rfgnjf++O7*|5vz2#XK;kk ztJbi%r0{U5@QwHYfwdjtqJ6?;X{Ul3?W0O0bZ$k*y z4jWsNedRoCb7_|>nazmq{T3Y_{<5IO&zQ?9&uS@iL+|K|eXy^F>-60HDoVvovHelY zy6p(}H^7b+$gu@7xLn_^oQryjVu#pRE5&-w5ZLCK&)WJ5jJF{B>y;-=)C;xbF#wig zNxN^>TwzZbV+{+M?}UfbFSe#(x$c)|d_9fRLLHH?Xbn!PoM{(+S5IEFRe4$aHg~hP zJYt`h&?WuNs4mVAmk$yeM;8?R6;YBMp8VilyM!RXWj<95=yp=4@y?`Ua8 znR^R?u&g%`$Wa~usp|pO$aMF-en!DrolPjD_g#{8X1f=#_7hH8i|WF+wMqmxUm*!G z*4p980g{sgR9?{}B+a0yiOdR()tWE8u)vMPxAdK)?$M+O_S+;nB34@o<%lGJbXbP` z5)<({mNpHp&45UvN`b&K5SD#W){}6Y_d4v~amZPGg|3GdlWDB;;?a=Z{dd zELTfXnjCqq{Dgbh9c%LjK!Epi1TGI{A7AP|eg2@TFQiUd4Bo!JsCqsS-8ml`j{gM& zEd7yU`djX!EX2I{WZq=qasFzdDWD`Z?ULFVIP!(KQP=fJh5QC9D|$JGV95jv)!sYWY?irpvh06rw&O?iIvMMj=X zr%`aa(|{Ad=Vr9%Q(61{PB-V_(3A%p&V#0zGKI1O(^;tkS{>Y<`Ql@_-b7IOT&@?l zavh?#FW?5otMIjq+Bp?Lq)w7S(0Vp0o!J*~O1>av;)Cdok@h&JKaoHDV6IVtJ?N#XY=lknPN+SN8@3Gb+D-X*y5pQ)wnIpQlRR!Rd)@0LdA85}1 zu7W6tJ*p26ovz+`YCPePT>-+p@T_QsW$uE`McLlXb;k}!wwWuh$YC4qHRd=RS!s>2 zo39VCB-#Ew?PAYOx`x!@0qa5lZKrE?PJEwVfkww#aB_$CLKlkzHSIi4p3#IeyA@u@ z`x^!`0HJxe>#V7+Grku^in>Ppz|TD*`Ca4X%R3Yo|J=!)l$vYks|KhG{1CEfyuzK( zLjCz{5l}9>$J=FC?59^85awK0$;^9t9UxwOU8kP7ReVCc*rPOr(9uMY*aCZi2=JBu z(D0svsJRB&a9nY;6|4kMr1Er5kUVOh1TuBwa3B2C<+rS|xJo&Lnx3K-*P83eXQCJ= z(htQSA3hgOMcs`#NdYB17#zP_1N_P0peHrNo1%NsYn=;PgLXTic6b#{Y0Z~x9Ffav z^3eO+diquPfo1AXW*>G(JcGn{yN?segqKL$Wc9po(Kex z#tw_};zd++we+MPhOOgaXSmguul67JOvBysmg?wRf=OUeh(XyRcyY@8RTV@xck_c~ zLFMWAWb4^7xwR)3iO1PIs1<}L3CMJ1L-}s=>_y!`!FvYf^pJO|&nII{!Dz+b?=bUd zPJUUn))z)-TcpqKF(1tr-x1;lS?SB@mT#O7skl0sER{a|d?&>EKKaw* zQ>D^m*pNgV`54BKv?knU-T5bcvBKnI@KZo^UYjKp{2hpCo?_6v(Sg77@nQa{tSKbn zUgMtF>A3hndGocRY+Snm#)Q4%`|Qq3YTOU^uG}BGlz!B=zb?vB16sN&6J`L(k1r+$ z5G6E9tJ~Iwd!d!NH7Q%Z@BR@0e{p6#XF2))?FLAVG`npIjih*I+0!f6;+DM zLOP-qDsm9=ZrI!lfSDn%XuF17$j~gZE@I}S(Ctw&Te75P5?Fj%FLT;p-tm33FaUQc z5cR;$SwV|N0xmjox3V~XL3sV?YN}U0kkfmygW@a5JOCGgce6JyzGmgN$?NM%4;wEhUMg0uTTB~L==1Fvc(6)KMLmU z(12l^#g&9OpF7+Ll30F6(q=~>NIY=-YUJJ}@&;!RYnq*xA9h!iMi`t;B2SUqbyNGn zye@*0#Uu`OQy%utS%IA%$M1f4B|bOH={!3K1=Tc7Ra|%qZgZ{mjAGKXb)}jUu1mQ_ zRW7<;tkHv(m7E0m>**8D;+2ddTL>EcH_1YqCaTTu_#6Djm z*64!w#=Hz<>Fi1n+P}l#-)0e0P4o+D8^^Mk& zhHeJoh2paKlO+8r?$tx`qEcm|PSt6|1$1q?r@VvvMd1!*zAy3<`X9j?ZI|;jE-F(H zIn1+sm(zAnoJArtytHC|0&F0`i*dy-PiwbD-+j`ezvd4C`%F1y^7t}2aww}ZlPk)t z=Y`tm#jNM$d`pG%F42Xmg_pZnEnvC%avz=xNs!=6b%%JSuc(WObezkCeZ#C|3PpXj zkR8hDPyTIUv~?<%*)6=8`WfPPyB9goi+p$1N2N<%!tS2wopT2x`2IZi?|_P{GA|I5 z?7DP*?Gi#2SJZ!x#W9Npm)T;=;~Swyeb*!P{I^s@o5m_3GS2Lg?VUeBdOeae7&s5$ zSL_VuTJih_fq7g8O8b0g+GbmE+xG}^Wx`g~{mWTyr@=h zKlAymoHeZa`DgR?Pj8Yc+I|MrSB>X*ts#wNFOJxs!3aGE)xeTHlF`fC5^g(DTacl$ zx!ezQJdwIyc$8RyNS~Wh{0pp>8NcW)*J=7AQYdT?(QhJuq4u`QniZ!%6l{KWp-0Xp z4ZC6(E(_&c$$U_cmGFslsyX6(62~m*z8Yx2p+F5xmD%6A7eOnx`1lJA-Mrc#&xZWJ zzXV{{OIgzYaq|D4k^j%z|8JB8GnRu3hw#8Z@({sSmsF(x>!w0Meg5y(zg!Z0S^0k# z5x^g1@L;toCK$NB|Fn commandSender.hasPermission("server.command.info")) - .executes(context -> { - final var sender = context.getSource(); - final var systemMXBean = (com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); - final var memoryMXBean = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage(); - - sender.sendMessage(Component.text() - .append(Component.text("Version: " + MinecraftServer.class.getPackage().getImplementationVersion())).appendNewline() - .append(Component.text("CPU: " + DECIMAL_FORMAT.format(systemMXBean.getCpuLoad() * 100) + "%")).appendNewline() - .append(Component.text("RAM: " + - toMB(memoryMXBean.getUsed()) + "/" + toMB(memoryMXBean.getMax()))).appendNewline() - .append(Component.text("Threads: " + Thread.getAllStackTraces().keySet().size()))); - return Command.SINGLE_SUCCESS; - }) - .build()); - } - - private static int toMB(final long bytes) { - return (int) (bytes / 1048576); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/command/defaults/ShutdownCommand.java b/server/src/main/java/de/bauhd/minecraft/server/command/defaults/ShutdownCommand.java deleted file mode 100644 index 252283d1..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/command/defaults/ShutdownCommand.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.bauhd.minecraft.server.command.defaults; - -import com.mojang.brigadier.Command; -import de.bauhd.minecraft.server.MinecraftServer; -import de.bauhd.minecraft.server.command.BrigadierCommand; - -public final class ShutdownCommand extends BrigadierCommand { - - public ShutdownCommand(final MinecraftServer server) { - super(literal("shutdown") - .requires(commandSender -> commandSender.hasPermission("server.command.shutdown")) - .executes(context -> { - server.shutdown(); - return Command.SINGLE_SUCCESS; - }) - .build()); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/NettyServerInitializer.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/NettyServerInitializer.java deleted file mode 100644 index 1b08c165..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/NettyServerInitializer.java +++ /dev/null @@ -1,32 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty; - -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.protocol.MineConnection; -import de.bauhd.minecraft.server.protocol.Protocol; -import de.bauhd.minecraft.server.protocol.netty.codec.MinecraftDecoder; -import de.bauhd.minecraft.server.protocol.netty.codec.MinecraftEncoder; -import de.bauhd.minecraft.server.protocol.netty.codec.VarIntFrameDecoder; -import de.bauhd.minecraft.server.protocol.netty.codec.VarIntLengthEncoder; -import io.netty5.channel.Channel; -import io.netty5.channel.ChannelInitializer; - -import static de.bauhd.minecraft.server.util.Constant.*; - -public final class NettyServerInitializer extends ChannelInitializer { - - private final AdvancedMinecraftServer server; - - public NettyServerInitializer(final AdvancedMinecraftServer server) { - this.server = server; - } - - @Override - protected void initChannel(Channel channel) { - channel.pipeline() - .addLast(FRAME_DECODER, new VarIntFrameDecoder()) - .addLast(FRAME_ENCODER, VarIntLengthEncoder.INSTANCE) - .addLast(MINECRAFT_DECODER, new MinecraftDecoder(Protocol.Direction.SERVERBOUND)) - .addLast(MINECRAFT_ENCODER, new MinecraftEncoder(Protocol.Direction.CLIENTBOUND)) - .addLast(HANDLER, new MineConnection(this.server, channel)); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherDecoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherDecoder.java deleted file mode 100644 index 380bc8e3..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherDecoder.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.MessageToMessageDecoder; - -public final class CipherDecoder extends MessageToMessageDecoder { - - private final JavaCipher cipher; - - public CipherDecoder(final JavaCipher cipher) { - this.cipher = cipher; - } - - @Override - protected void decode(ChannelHandlerContext ctx, Buffer msg) throws Exception { - ctx.fireChannelRead(this.cipher.process(ctx, msg)); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherEncoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherEncoder.java deleted file mode 100644 index 57d60683..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CipherEncoder.java +++ /dev/null @@ -1,21 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.MessageToMessageEncoder; - -import java.util.List; - -public final class CipherEncoder extends MessageToMessageEncoder { - - private final JavaCipher cipher; - - public CipherEncoder(final JavaCipher cipher) { - this.cipher = cipher; - } - - @Override - protected void encode(ChannelHandlerContext ctx, Buffer msg, List out) throws Exception { - out.add(this.cipher.process(ctx, msg)); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorDecoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorDecoder.java deleted file mode 100644 index 1dfffd20..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorDecoder.java +++ /dev/null @@ -1,48 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import de.bauhd.minecraft.server.protocol.packet.PacketUtils; -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.MessageToMessageDecoder; - -import java.util.zip.DataFormatException; -import java.util.zip.Inflater; - -public final class CompressorDecoder extends MessageToMessageDecoder { - - private final Inflater inflater; - private final byte[] encode = new byte[8192]; - - public CompressorDecoder() { - this.inflater = new Inflater(false); - } - - @Override - protected void decodeAndClose(ChannelHandlerContext ctx, Buffer buf) { - final int size = PacketUtils.readVarInt(buf); - if (size == 0) { - ctx.fireChannelRead(buf); - return; - } - - try (buf) { - final var bytes = new byte[buf.readableBytes()]; - buf.readBytes(bytes, 0, bytes.length); - this.inflater.setInput(bytes); - final var out = ctx.bufferAllocator().allocate(0); - while (!this.inflater.finished() && this.inflater.getBytesWritten() < size) { - out.writeBytes(this.encode, 0, this.inflater.inflate(this.encode)); - } - ctx.fireChannelRead(out); - } catch (DataFormatException e) { - throw new RuntimeException(e); - } finally { - this.inflater.reset(); - } - } - - @Override - public void handlerRemoved(ChannelHandlerContext ctx) { - this.inflater.end(); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorEncoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorEncoder.java deleted file mode 100644 index e8af07a6..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/CompressorEncoder.java +++ /dev/null @@ -1,63 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import de.bauhd.minecraft.server.MinecraftConfig; -import de.bauhd.minecraft.server.protocol.packet.PacketUtils; -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.MessageToByteEncoder; - -import java.util.zip.Deflater; - -public final class CompressorEncoder extends MessageToByteEncoder { - - private final int threshold; - private final Deflater deflater; - private final byte[] encode = new byte[8192]; - - public CompressorEncoder(final MinecraftConfig config) { - this.threshold = config.compressionThreshold(); - this.deflater = new Deflater(config.compressionLevel(), false); - } - - @Override - protected void encode(ChannelHandlerContext channelHandlerContext, Buffer buf, Buffer out) { - final var size = buf.readableBytes(); - if (size < this.threshold) { // under threshold - so nothing to do - PacketUtils.writeVarInt(out, size + 1); - PacketUtils.writeVarInt(out, 0); - out.writeBytes(buf); - } else { - out.writeMedium(8421376); - PacketUtils.writeVarInt(out, size); - final var bytes = new byte[size]; - buf.readBytes(bytes, 0, bytes.length); - this.deflater.setInput(bytes); - this.deflater.finish(); - while (!this.deflater.finished()) { - out.writeBytes(this.encode, 0, this.deflater.deflate(this.encode)); - } - this.deflater.reset(); - final var length = out.readableBytes() - 3; - final var offset = out.writerOffset(); - out.writerOffset(0); - out.writeMedium((length & 0x7F | 0x80) << 16 | ((length >>> 7) & 0x7F | 0x80) << 8 | (length >>> 14)); - out.writerOffset(offset); - } - } - - @Override - protected Buffer allocateBuffer(ChannelHandlerContext channelHandlerContext, Buffer buf) { - var size = buf.readableBytes(); - if (size < this.threshold) { - size += 1 + PacketUtils.varIntLength(size + 1); - } else { - size += 2 + PacketUtils.varIntLength(size); - } - return channelHandlerContext.bufferAllocator().allocate(size); - } - - @Override - public void handlerRemoved(ChannelHandlerContext ctx) { - this.deflater.end(); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/JavaCipher.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/JavaCipher.java deleted file mode 100644 index 4cd6c6de..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/JavaCipher.java +++ /dev/null @@ -1,34 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; - -import javax.crypto.Cipher; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; - -public final class JavaCipher { - - private final Cipher cipher; - - public JavaCipher(final SecretKey secretKey, final int mode) { - try { - this.cipher = Cipher.getInstance("AES/CFB8/NoPadding"); - this.cipher.init(mode, secretKey, new IvParameterSpec(secretKey.getEncoded())); - } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidAlgorithmParameterException | - InvalidKeyException e) { - throw new RuntimeException(e); - } - } - - public Buffer process(final ChannelHandlerContext ctx, final Buffer buf) throws Exception { - final var bytes = new byte[buf.readableBytes()]; - buf.readBytes(bytes, 0, bytes.length); - this.cipher.update(bytes, 0, bytes.length, bytes, 0); - return ctx.bufferAllocator().copyOf(bytes); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftDecoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftDecoder.java deleted file mode 100644 index a88fa1f3..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftDecoder.java +++ /dev/null @@ -1,74 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import de.bauhd.minecraft.server.protocol.Protocol; -import de.bauhd.minecraft.server.protocol.State; -import de.bauhd.minecraft.server.protocol.packet.PacketUtils; -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandler; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.DecoderException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public final class MinecraftDecoder implements ChannelHandler { - - private static final Logger LOGGER = LogManager.getLogger(MinecraftDecoder.class); - - private final Protocol.Direction direction; - private State.PacketRegistry registry; - - public MinecraftDecoder(Protocol.Direction direction) { - this.direction = direction; - } - - @Override - public void channelRead(ChannelHandlerContext ctx, Object message) { - if (message instanceof Buffer buf) { - if (!ctx.channel().isActive() || buf.readableBytes() <= 0) { - buf.close(); - return; - } - - final var offset = buf.readerOffset(); - final var id = PacketUtils.readVarInt(buf); - final var packet = this.registry.createPacket(id); - if (packet == null) { - buf.readerOffset(offset); - ctx.fireChannelRead(message); - LOGGER.warn("Unknown packet id 0x" + Integer.toHexString(id)); - } else { - try (buf) { - final var minLength = packet.minLength(); - final var maxLength = packet.maxLength(); - final var length = buf.readableBytes(); - if (maxLength != -1 && length > maxLength) { - throw new DecoderException("Overflow packet " + packet.getClass().getSimpleName() + - " (max length = " + maxLength + ", length = " + length + ")"); - } - if (length < minLength) { - throw new DecoderException("Underflow packet " + packet.getClass().getSimpleName() + - " (min length = " + minLength + ", length = " + length + ")"); - } - - try { - packet.decode(new de.bauhd.minecraft.server.protocol.Buffer(buf)); - } catch (Exception e) { - LOGGER.error("Error during decoding of " + packet.getClass(), e); - } - if (buf.readableBytes() > 0) { - throw new DecoderException("Overflow after decode packet " + - packet.getClass().getSimpleName() + " (length = " + buf.readableBytes() + ")"); - } - //System.out.println("decoded " + packet + " - " + id); - ctx.fireChannelRead(packet); - } - } - } else { - ctx.fireChannelRead(message); - } - } - - public void setState(final State state) { - this.registry = this.direction.getRegistry(state); - } -} \ No newline at end of file diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftEncoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftEncoder.java deleted file mode 100644 index 063533be..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/MinecraftEncoder.java +++ /dev/null @@ -1,37 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import de.bauhd.minecraft.server.protocol.Protocol; -import de.bauhd.minecraft.server.protocol.State; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketUtils; -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.MessageToByteEncoder; - -public final class MinecraftEncoder extends MessageToByteEncoder { - - private final Protocol.Direction direction; - private State.PacketRegistry registry; - - public MinecraftEncoder(final Protocol.Direction direction) { - this.direction = direction; - } - - @Override - protected void encode(ChannelHandlerContext ctx, Packet packet, Buffer buf) { - PacketUtils.writeVarInt(buf, this.registry.getPacketId(packet)); - packet.encode(new de.bauhd.minecraft.server.protocol.Buffer(buf)); - - //System.out.println("encode " + packet + " - " + this.registry.getPacketId(packet)); - } - - @Override - protected Buffer allocateBuffer(ChannelHandlerContext channelHandlerContext, Packet packet) { - return channelHandlerContext.bufferAllocator() - .allocate(PacketUtils.varIntLength(this.registry.getPacketId(packet)) + packet.minLength()); - } - - public void setState(final State state) { - this.registry = this.direction.getRegistry(state); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntFrameDecoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntFrameDecoder.java deleted file mode 100644 index c2318646..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntFrameDecoder.java +++ /dev/null @@ -1,39 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import de.bauhd.minecraft.server.protocol.packet.PacketUtils; -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.ByteToMessageDecoder; - -public final class VarIntFrameDecoder extends ByteToMessageDecoder { - - @Override - protected void decode(ChannelHandlerContext ctx, Buffer buf) { - if (!ctx.channel().isActive()) { - buf.close(); - return; - } - - final var readerIndex = buf.readerOffset(); - final var length = PacketUtils.readVarInt(buf); - - if (readerIndex == buf.readerOffset()) { - buf.readerOffset(readerIndex); - return; - } - - if (length <= 0) { - if (buf.readableBytes() > 0) { - buf.skipReadableBytes(buf.readableBytes()); - } - return; - } - - if (buf.readableBytes() >= length) { - ctx.fireChannelRead(buf.copy(buf.readerOffset(), length, true)); - buf.skipReadableBytes(length); - } else { - buf.readerOffset(readerIndex); - } - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntLengthEncoder.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntLengthEncoder.java deleted file mode 100644 index e1b911cf..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/codec/VarIntLengthEncoder.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.bauhd.minecraft.server.protocol.netty.codec; - -import de.bauhd.minecraft.server.protocol.packet.PacketUtils; -import io.netty5.buffer.Buffer; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.handler.codec.MessageToByteEncoder; - -public final class VarIntLengthEncoder extends MessageToByteEncoder { - - public static final VarIntLengthEncoder INSTANCE = new VarIntLengthEncoder(); - - @Override - protected void encode(ChannelHandlerContext ctx, Buffer msg, Buffer out) { - PacketUtils.writeVarInt(out, msg.readableBytes()); - out.writeBytes(msg); - } - - @Override - protected Buffer allocateBuffer(ChannelHandlerContext channelHandlerContext, Buffer buf) { - return channelHandlerContext.bufferAllocator() - .allocate(PacketUtils.varIntLength(buf.readableBytes()) + buf.readableBytes()); - } - - @Override - public boolean isSharable() { - return true; - } - -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateRecipes.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateRecipes.java deleted file mode 100644 index 7c229667..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateRecipes.java +++ /dev/null @@ -1,12 +0,0 @@ -package de.bauhd.minecraft.server.protocol.packet.play; - -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; - -public final class UpdateRecipes implements Packet { - - @Override - public void encode(Buffer buf) { - buf.writeVarInt(0); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateTags.java b/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateTags.java deleted file mode 100644 index 9a610fa9..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateTags.java +++ /dev/null @@ -1,12 +0,0 @@ -package de.bauhd.minecraft.server.protocol.packet.play; - -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; - -public final class UpdateTags implements Packet { - - @Override - public void encode(Buffer buf) { - buf.writeVarInt(0); - } -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/ChunkLoader.java b/server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/ChunkLoader.java deleted file mode 100644 index 469c47f4..00000000 --- a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/ChunkLoader.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.bauhd.minecraft.server.world.chunk.loader; - -import de.bauhd.minecraft.server.world.MinecraftWorld; -import de.bauhd.minecraft.server.world.chunk.ChunkGenerator; -import de.bauhd.minecraft.server.world.chunk.MinecraftChunk; -import org.jetbrains.annotations.NotNull; - -public interface ChunkLoader { - - @NotNull MinecraftChunk loadChunk(MinecraftWorld world, int x, int z); - - @NotNull ChunkGenerator getGenerator(); -} diff --git a/server/src/main/java/de/bauhd/minecraft/server/Main.java b/server/src/main/java/de/bauhd/sculk/Main.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/Main.java rename to server/src/main/java/de/bauhd/sculk/Main.java index 630efca0..a0d19e85 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/Main.java +++ b/server/src/main/java/de/bauhd/sculk/Main.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server; +package de.bauhd.sculk; public final class Main { @@ -7,6 +7,6 @@ public final class Main { } public static void main(String[] args) { - new AdvancedMinecraftServer(); + new SculkMinecraftServer(); } } diff --git a/server/src/main/java/de/bauhd/minecraft/server/MinecraftConfiguration.java b/server/src/main/java/de/bauhd/sculk/SculkConfiguration.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/MinecraftConfiguration.java rename to server/src/main/java/de/bauhd/sculk/SculkConfiguration.java index 9b6534f5..84b99f03 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/MinecraftConfiguration.java +++ b/server/src/main/java/de/bauhd/sculk/SculkConfiguration.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server; +package de.bauhd.sculk; import org.jetbrains.annotations.NotNull; -public final class MinecraftConfiguration implements MinecraftConfig { +public final class SculkConfiguration implements MinecraftConfig { private final String host; private final int port; @@ -10,7 +10,7 @@ public final class MinecraftConfiguration implements MinecraftConfig { private final int compressionThreshold; private final int compressionLevel; - public MinecraftConfiguration() { + public SculkConfiguration() { this.host = "0.0.0.0"; this.port = 25565; this.mode = Mode.ONLINE; diff --git a/server/src/main/java/de/bauhd/minecraft/server/AdvancedMinecraftServer.java b/server/src/main/java/de/bauhd/sculk/SculkMinecraftServer.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/AdvancedMinecraftServer.java rename to server/src/main/java/de/bauhd/sculk/SculkMinecraftServer.java index dfe6a254..dc3430d1 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/AdvancedMinecraftServer.java +++ b/server/src/main/java/de/bauhd/sculk/SculkMinecraftServer.java @@ -1,45 +1,47 @@ -package de.bauhd.minecraft.server; +package de.bauhd.sculk; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.reflect.TypeToken; -import de.bauhd.minecraft.server.command.CommandSource; -import de.bauhd.minecraft.server.command.MineCommandHandler; -import de.bauhd.minecraft.server.command.defaults.InfoCommand; -import de.bauhd.minecraft.server.command.defaults.ShutdownCommand; -import de.bauhd.minecraft.server.container.*; -import de.bauhd.minecraft.server.damage.DamageType; -import de.bauhd.minecraft.server.entity.Entity; -import de.bauhd.minecraft.server.entity.EntityClassToSupplierMap; -import de.bauhd.minecraft.server.entity.player.GameProfile; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.event.MineEventHandler; -import de.bauhd.minecraft.server.event.lifecycle.ServerInitializeEvent; -import de.bauhd.minecraft.server.event.lifecycle.ServerShutdownEvent; -import de.bauhd.minecraft.server.json.GameProfileDeserializer; -import de.bauhd.minecraft.server.json.GameProfilePropertyDeserializer; -import de.bauhd.minecraft.server.plugin.MinePluginHandler; -import de.bauhd.minecraft.server.protocol.MineConnection; -import de.bauhd.minecraft.server.protocol.netty.NettyServer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.login.CompressionPacket; -import de.bauhd.minecraft.server.registry.Registry; -import de.bauhd.minecraft.server.registry.SimpleRegistry; -import de.bauhd.minecraft.server.terminal.SimpleTerminal; -import de.bauhd.minecraft.server.util.BossBarListener; -import de.bauhd.minecraft.server.world.MinecraftWorld; -import de.bauhd.minecraft.server.world.World; -import de.bauhd.minecraft.server.world.biome.Biome; -import de.bauhd.minecraft.server.world.block.BlockParent; -import de.bauhd.minecraft.server.world.block.BlockState; -import de.bauhd.minecraft.server.world.block.MineBlockState; -import de.bauhd.minecraft.server.world.chunk.loader.AnvilLoader; -import de.bauhd.minecraft.server.world.chunk.loader.ChunkLoader; -import de.bauhd.minecraft.server.world.chunk.loader.DefaultChunkLoader; -import de.bauhd.minecraft.server.world.dimension.Dimension; -import de.bauhd.minecraft.server.world.dimension.DimensionRegistry; +import com.velocitypowered.natives.util.Natives; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.sculk.command.MineCommandHandler; +import de.bauhd.sculk.command.defaults.InfoCommand; +import de.bauhd.sculk.command.defaults.ShutdownCommand; +import de.bauhd.sculk.container.*; +import de.bauhd.sculk.damage.DamageType; +import de.bauhd.sculk.entity.Entity; +import de.bauhd.sculk.entity.EntityClassToSupplierMap; +import de.bauhd.sculk.entity.player.GameProfile; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.event.MineEventHandler; +import de.bauhd.sculk.event.lifecycle.ServerInitializeEvent; +import de.bauhd.sculk.event.lifecycle.ServerShutdownEvent; +import de.bauhd.sculk.json.GameProfileDeserializer; +import de.bauhd.sculk.json.GameProfilePropertyDeserializer; +import de.bauhd.sculk.plugin.MinePluginHandler; +import de.bauhd.sculk.protocol.MineConnection; +import de.bauhd.sculk.protocol.netty.NettyServer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.login.CompressionPacket; +import de.bauhd.sculk.registry.Registry; +import de.bauhd.sculk.registry.SimpleRegistry; +import de.bauhd.sculk.terminal.SimpleTerminal; +import de.bauhd.sculk.util.BossBarListener; +import de.bauhd.sculk.world.MinecraftWorld; +import de.bauhd.sculk.world.World; +import de.bauhd.sculk.world.biome.Biome; +import de.bauhd.sculk.world.block.BlockParent; +import de.bauhd.sculk.world.block.BlockState; +import de.bauhd.sculk.world.block.MineBlockState; +import de.bauhd.sculk.world.chunk.loader.AnvilLoader; +import de.bauhd.sculk.world.chunk.loader.ChunkLoader; +import de.bauhd.sculk.world.chunk.loader.DefaultChunkLoader; +import de.bauhd.sculk.world.dimension.Dimension; +import de.bauhd.sculk.world.dimension.DimensionRegistry; +import io.netty.channel.epoll.Epoll; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.apache.logging.log4j.LogManager; @@ -59,19 +61,20 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; -public final class AdvancedMinecraftServer implements MinecraftServer { +public final class SculkMinecraftServer implements MinecraftServer { - private static final Logger LOGGER = LogManager.getLogger(AdvancedMinecraftServer.class); + private static final Logger LOGGER = LogManager.getLogger(SculkMinecraftServer.class); public static final Gson GSON = new GsonBuilder() .registerTypeAdapter(GameProfile.Property.class, new GameProfilePropertyDeserializer()) .registerTypeAdapter(GameProfile.class, new GameProfileDeserializer()) .setPrettyPrinting() .create(); + public static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); private boolean running = true; - private MinecraftConfiguration configuration; + private SculkConfiguration configuration; private KeyPair keyPair; private final Map players = new ConcurrentHashMap<>(); @@ -88,10 +91,12 @@ public final class AdvancedMinecraftServer implements MinecraftServer { @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") private final EntityClassToSupplierMap entities = new EntityClassToSupplierMap(); - AdvancedMinecraftServer() { + SculkMinecraftServer() { final var startTime = System.currentTimeMillis(); this.terminal = new SimpleTerminal(this); this.terminal.setupStreams(); + final var packge = this.getClass().getPackage(); + LOGGER.info("Booting up {} {}...", packge.getImplementationTitle(), packge.getImplementationVersion()); this.loadConfig(); @@ -105,6 +110,9 @@ public final class AdvancedMinecraftServer implements MinecraftServer { } } + LOGGER.info("Connections will use {} channels, {} compression, {} ciphers", + Epoll.isAvailable() ? "epoll" : "nio", Natives.compress.getLoadedVariant(), Natives.cipher.getLoadedVariant()); + this.dimensionRegistry = new DimensionRegistry(); this.biomeRegistry = new SimpleRegistry<>("minecraft:worldgen/biome", Biome.PLAINS); this.damageTypeRegistry = new SimpleRegistry<>("minecraft:damage_type", DamageType.OUT_OF_WORLD); @@ -120,8 +128,8 @@ public final class AdvancedMinecraftServer implements MinecraftServer { this.pluginHandler = new MinePluginHandler(this); this.eventHandler = new MineEventHandler(); this.commandHandler = (MineCommandHandler) new MineCommandHandler(this) // register defaults - .register(new ShutdownCommand(this)) - .register(new InfoCommand()); + .register(ShutdownCommand.get(this)) + .register(InfoCommand.get()); this.bossBarListener = new BossBarListener(); this.loadBlocks(); @@ -133,7 +141,7 @@ public final class AdvancedMinecraftServer implements MinecraftServer { this.nettyServer = new NettyServer(this); this.nettyServer.connect(this.configuration.host(), this.configuration.port()); - LOGGER.info("Done ({}s)!", new DecimalFormat("#.##") + LOGGER.info("Done ({}s)!", DECIMAL_FORMAT .format((System.currentTimeMillis() - startTime) / 1000D)); Runtime.getRuntime().addShutdownHook(new Thread(() -> this.shutdown(false), "Minecraft Shutdown Thread")); @@ -183,13 +191,13 @@ private void loadConfig() { try { if (Files.notExists(path)) { Files.createFile(path); - this.configuration = new MinecraftConfiguration(); + this.configuration = new SculkConfiguration(); try (final var writer = Files.newBufferedWriter(path)) { writer.write(GSON.toJson(this.configuration)); } } else { try (final var reader = Files.newBufferedReader(path)) { - this.configuration = GSON.fromJson(reader, MinecraftConfiguration.class); + this.configuration = GSON.fromJson(reader, SculkConfiguration.class); } } } catch (IOException e) { @@ -354,7 +362,7 @@ public T createEntity(@NotNull Class clazz) { } @Override - public @NotNull MinecraftConfiguration getConfig() { + public @NotNull SculkConfiguration getConfig() { return this.configuration; } diff --git a/server/src/main/java/de/bauhd/minecraft/server/adventure/AdventureLoggerProvider.java b/server/src/main/java/de/bauhd/sculk/adventure/AdventureLoggerProvider.java similarity index 94% rename from server/src/main/java/de/bauhd/minecraft/server/adventure/AdventureLoggerProvider.java rename to server/src/main/java/de/bauhd/sculk/adventure/AdventureLoggerProvider.java index 7bad3476..dcecde7c 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/adventure/AdventureLoggerProvider.java +++ b/server/src/main/java/de/bauhd/sculk/adventure/AdventureLoggerProvider.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.adventure; +package de.bauhd.sculk.adventure; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.logger.slf4j.ComponentLogger; diff --git a/server/src/main/java/de/bauhd/minecraft/server/command/MineCommandHandler.java b/server/src/main/java/de/bauhd/sculk/command/MineCommandHandler.java similarity index 66% rename from server/src/main/java/de/bauhd/minecraft/server/command/MineCommandHandler.java rename to server/src/main/java/de/bauhd/sculk/command/MineCommandHandler.java index 744887fb..f9253f80 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/command/MineCommandHandler.java +++ b/server/src/main/java/de/bauhd/sculk/command/MineCommandHandler.java @@ -1,36 +1,32 @@ -package de.bauhd.minecraft.server.command; +package de.bauhd.sculk.command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.exceptions.CommandSyntaxException; +import com.mojang.brigadier.tree.LiteralCommandNode; import com.mojang.brigadier.tree.RootCommandNode; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.event.command.CommandExecuteEvent; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.event.command.CommandExecuteEvent; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; -import java.util.HashMap; -import java.util.Map; - public final class MineCommandHandler implements CommandHandler { private static final Logger LOGGER = LogManager.getLogger(MineCommandHandler.class); - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final CommandDispatcher dispatcher; - private final Map commands = new HashMap<>(); - public MineCommandHandler(final AdvancedMinecraftServer server) { + public MineCommandHandler(final SculkMinecraftServer server) { this.server = server; this.dispatcher = new CommandDispatcher<>(); } @Override - public @NotNull CommandHandler register(@NotNull BrigadierCommand command) { - this.commands.put(command.node().getName(), command); - this.dispatcher.getRoot().addChild(command.node()); + public @NotNull CommandHandler register(@NotNull LiteralCommandNode node) { + this.dispatcher.getRoot().addChild(node); return this; } @@ -48,10 +44,6 @@ public void execute(@NotNull CommandSource source, @NotNull String command) { }); } - public Map commands() { - return this.commands; - } - public RootCommandNode root() { return this.dispatcher.getRoot(); } diff --git a/server/src/main/java/de/bauhd/sculk/command/defaults/InfoCommand.java b/server/src/main/java/de/bauhd/sculk/command/defaults/InfoCommand.java new file mode 100644 index 00000000..e61ba26a --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/command/defaults/InfoCommand.java @@ -0,0 +1,41 @@ +package de.bauhd.sculk.command.defaults; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.tree.LiteralCommandNode; +import com.sun.management.OperatingSystemMXBean; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.MinecraftServer; +import de.bauhd.sculk.command.CommandSource; +import net.kyori.adventure.text.Component; + +import java.lang.management.ManagementFactory; +import java.lang.management.MemoryMXBean; + +import static net.kyori.adventure.text.Component.text; + +public final class InfoCommand { + + private static final OperatingSystemMXBean OPERATING_SYSTEM_MX_BEAN = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); + private static final MemoryMXBean MEMORY_MX_BEAN = ManagementFactory.getMemoryMXBean(); + + public static LiteralCommandNode get() { + return LiteralArgumentBuilder.literal("info") + .requires(commandSource -> commandSource.hasPermission("server.command.info")) + .executes(context -> { + final var heapMemoryUsage = MEMORY_MX_BEAN.getHeapMemoryUsage(); + context.getSource().sendMessage(text() + .append(text("Version: " + MinecraftServer.class.getPackage().getImplementationVersion())).appendNewline() + .append(Component.text("CPU: " + SculkMinecraftServer.DECIMAL_FORMAT.format(OPERATING_SYSTEM_MX_BEAN.getCpuLoad() * 100) + "%")).appendNewline() + .append(text("RAM (Heap): " + + toMB(heapMemoryUsage.getUsed()) + "/" + toMB(heapMemoryUsage.getMax()))).appendNewline() + .append(text("Threads: " + Thread.getAllStackTraces().keySet().size()))); + return Command.SINGLE_SUCCESS; + }) + .build(); + } + + private static int toMB(final long bytes) { + return (int) (bytes >> 20); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/command/defaults/ShutdownCommand.java b/server/src/main/java/de/bauhd/sculk/command/defaults/ShutdownCommand.java new file mode 100644 index 00000000..9c84f891 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/command/defaults/ShutdownCommand.java @@ -0,0 +1,20 @@ +package de.bauhd.sculk.command.defaults; + +import com.mojang.brigadier.Command; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.tree.LiteralCommandNode; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.command.CommandSource; + +public final class ShutdownCommand { + + public static LiteralCommandNode get(final SculkMinecraftServer server) { + return LiteralArgumentBuilder.literal("shutdown") + .requires(commandSource -> commandSource.hasPermission("server.command.shutdown")) + .executes(context -> { + server.shutdown(); + return Command.SINGLE_SUCCESS; + }) + .build(); + } +} diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/GenericContainer.java b/server/src/main/java/de/bauhd/sculk/container/GenericContainer.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/container/GenericContainer.java rename to server/src/main/java/de/bauhd/sculk/container/GenericContainer.java index 42f746dc..c108929f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/GenericContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/GenericContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineAnvilContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineAnvilContainer.java similarity index 87% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineAnvilContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineAnvilContainer.java index ba3947da..536c7040 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineAnvilContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineAnvilContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineBeaconContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineBeaconContainer.java similarity index 91% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineBeaconContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineBeaconContainer.java index 3263f273..7281be80 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineBeaconContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineBeaconContainer.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.potion.PotionEffect; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.potion.PotionEffect; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineBrewingStandContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineBrewingStandContainer.java similarity index 91% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineBrewingStandContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineBrewingStandContainer.java index 9e11dd0b..c56ff095 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineBrewingStandContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineBrewingStandContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineContainer.java similarity index 77% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineContainer.java index 29cc40d3..104c1209 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineContainer.java @@ -1,12 +1,12 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.Viewable; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.play.container.ContainerProperty; -import de.bauhd.minecraft.server.util.ItemList; +import de.bauhd.sculk.Viewable; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.play.container.ContainerProperty; +import de.bauhd.sculk.util.ItemList; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineEnchantingTableContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineEnchantingTableContainer.java similarity index 96% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineEnchantingTableContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineEnchantingTableContainer.java index a6d74201..8216a33e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineEnchantingTableContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineEnchantingTableContainer.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.enchantment.Enchantment; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.enchantment.Enchantment; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineFurnaceContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineFurnaceContainer.java similarity index 94% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineFurnaceContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineFurnaceContainer.java index 25b64aa4..9c9c0163 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineFurnaceContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineFurnaceContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineInventory.java b/server/src/main/java/de/bauhd/sculk/container/MineInventory.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineInventory.java rename to server/src/main/java/de/bauhd/sculk/container/MineInventory.java index 6b244170..ec58d0bd 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineInventory.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineInventory.java @@ -1,10 +1,10 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.protocol.packet.play.Equipment; -import de.bauhd.minecraft.server.protocol.packet.play.container.ContainerSlot; -import de.bauhd.minecraft.server.util.ItemList; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.protocol.packet.play.Equipment; +import de.bauhd.sculk.protocol.packet.play.container.ContainerSlot; +import de.bauhd.sculk.util.ItemList; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineLecternContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineLecternContainer.java similarity index 86% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineLecternContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineLecternContainer.java index 8edf97e1..20e2eb46 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineLecternContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineLecternContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineLoomContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineLoomContainer.java similarity index 87% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineLoomContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineLoomContainer.java index 7c61cb34..920247a3 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineLoomContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineLoomContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/container/MineStonecutterContainer.java b/server/src/main/java/de/bauhd/sculk/container/MineStonecutterContainer.java similarity index 87% rename from server/src/main/java/de/bauhd/minecraft/server/container/MineStonecutterContainer.java rename to server/src/main/java/de/bauhd/sculk/container/MineStonecutterContainer.java index 8c4de84b..1354e82e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/container/MineStonecutterContainer.java +++ b/server/src/main/java/de/bauhd/sculk/container/MineStonecutterContainer.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.container; +package de.bauhd.sculk.container; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.MinecraftPlayer; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractAnimal.java b/server/src/main/java/de/bauhd/sculk/entity/AbstractAnimal.java similarity index 92% rename from server/src/main/java/de/bauhd/minecraft/server/entity/AbstractAnimal.java rename to server/src/main/java/de/bauhd/sculk/entity/AbstractAnimal.java index b7bf3580..eaf4dfaa 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractAnimal.java +++ b/server/src/main/java/de/bauhd/sculk/entity/AbstractAnimal.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; public abstract class AbstractAnimal extends AbstractMob implements Animal { diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractEntity.java b/server/src/main/java/de/bauhd/sculk/entity/AbstractEntity.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/entity/AbstractEntity.java rename to server/src/main/java/de/bauhd/sculk/entity/AbstractEntity.java index c5012fa9..495d28e3 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractEntity.java +++ b/server/src/main/java/de/bauhd/sculk/entity/AbstractEntity.java @@ -1,15 +1,15 @@ -package de.bauhd.minecraft.server.entity; - -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.play.EntityMetadata; -import de.bauhd.minecraft.server.protocol.packet.play.RemoveEntities; -import de.bauhd.minecraft.server.protocol.packet.play.SpawnEntity; -import de.bauhd.minecraft.server.world.MinecraftWorld; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.World; -import de.bauhd.minecraft.server.world.chunk.MinecraftChunk; +package de.bauhd.sculk.entity; + +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.play.EntityMetadata; +import de.bauhd.sculk.protocol.packet.play.RemoveEntities; +import de.bauhd.sculk.protocol.packet.play.SpawnEntity; +import de.bauhd.sculk.world.MinecraftWorld; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.World; +import de.bauhd.sculk.world.chunk.MinecraftChunk; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractLivingEntity.java b/server/src/main/java/de/bauhd/sculk/entity/AbstractLivingEntity.java similarity index 97% rename from server/src/main/java/de/bauhd/minecraft/server/entity/AbstractLivingEntity.java rename to server/src/main/java/de/bauhd/sculk/entity/AbstractLivingEntity.java index 2cc8cb27..a83897bc 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractLivingEntity.java +++ b/server/src/main/java/de/bauhd/sculk/entity/AbstractLivingEntity.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import java.util.UUID; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractMob.java b/server/src/main/java/de/bauhd/sculk/entity/AbstractMob.java similarity index 81% rename from server/src/main/java/de/bauhd/minecraft/server/entity/AbstractMob.java rename to server/src/main/java/de/bauhd/sculk/entity/AbstractMob.java index 3ebad4f3..dd9cc815 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractMob.java +++ b/server/src/main/java/de/bauhd/sculk/entity/AbstractMob.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; public abstract class AbstractMob extends AbstractLivingEntity implements Mob { diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractTameableAnimal.java b/server/src/main/java/de/bauhd/sculk/entity/AbstractTameableAnimal.java similarity index 93% rename from server/src/main/java/de/bauhd/minecraft/server/entity/AbstractTameableAnimal.java rename to server/src/main/java/de/bauhd/sculk/entity/AbstractTameableAnimal.java index 04f9cdc2..5cdca309 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/AbstractTameableAnimal.java +++ b/server/src/main/java/de/bauhd/sculk/entity/AbstractTameableAnimal.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.Nullable; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/EntityClassToSupplierMap.java b/server/src/main/java/de/bauhd/sculk/entity/EntityClassToSupplierMap.java similarity index 99% rename from server/src/main/java/de/bauhd/minecraft/server/entity/EntityClassToSupplierMap.java rename to server/src/main/java/de/bauhd/sculk/entity/EntityClassToSupplierMap.java index 39ca08d5..e0273222 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/EntityClassToSupplierMap.java +++ b/server/src/main/java/de/bauhd/sculk/entity/EntityClassToSupplierMap.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import java.util.HashMap; import java.util.function.Supplier; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/Metadata.java b/server/src/main/java/de/bauhd/sculk/entity/Metadata.java similarity index 97% rename from server/src/main/java/de/bauhd/minecraft/server/entity/Metadata.java rename to server/src/main/java/de/bauhd/sculk/entity/Metadata.java index 5e10f3ed..28ffb5b6 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/Metadata.java +++ b/server/src/main/java/de/bauhd/sculk/entity/Metadata.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.world.Position; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.world.Position; import net.kyori.adventure.nbt.CompoundBinaryTag; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.Nullable; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineAllay.java b/server/src/main/java/de/bauhd/sculk/entity/MineAllay.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineAllay.java rename to server/src/main/java/de/bauhd/sculk/entity/MineAllay.java index 9639f7f0..38946529 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineAllay.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineAllay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineAreaEffectCloud.java b/server/src/main/java/de/bauhd/sculk/entity/MineAreaEffectCloud.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineAreaEffectCloud.java rename to server/src/main/java/de/bauhd/sculk/entity/MineAreaEffectCloud.java index 5c49ed97..3376f550 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineAreaEffectCloud.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineAreaEffectCloud.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineArmorStand.java b/server/src/main/java/de/bauhd/sculk/entity/MineArmorStand.java similarity index 97% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineArmorStand.java rename to server/src/main/java/de/bauhd/sculk/entity/MineArmorStand.java index 96fdcefc..c12e4f37 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineArmorStand.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineArmorStand.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineArrow.java b/server/src/main/java/de/bauhd/sculk/entity/MineArrow.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineArrow.java rename to server/src/main/java/de/bauhd/sculk/entity/MineArrow.java index 7e4aa1bd..fd3afe3b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineArrow.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineArrow.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineAxolotl.java b/server/src/main/java/de/bauhd/sculk/entity/MineAxolotl.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineAxolotl.java rename to server/src/main/java/de/bauhd/sculk/entity/MineAxolotl.java index 2e3cc811..347280bf 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineAxolotl.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineAxolotl.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBat.java b/server/src/main/java/de/bauhd/sculk/entity/MineBat.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineBat.java rename to server/src/main/java/de/bauhd/sculk/entity/MineBat.java index e411e7a7..af345369 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBat.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineBat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBee.java b/server/src/main/java/de/bauhd/sculk/entity/MineBee.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineBee.java rename to server/src/main/java/de/bauhd/sculk/entity/MineBee.java index a5cff6f7..8a20dbe3 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBee.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineBee.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBlaze.java b/server/src/main/java/de/bauhd/sculk/entity/MineBlaze.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineBlaze.java rename to server/src/main/java/de/bauhd/sculk/entity/MineBlaze.java index 49e70cf0..a71e62cf 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBlaze.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineBlaze.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBlockDisplay.java b/server/src/main/java/de/bauhd/sculk/entity/MineBlockDisplay.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineBlockDisplay.java rename to server/src/main/java/de/bauhd/sculk/entity/MineBlockDisplay.java index 239f20bd..25357919 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBlockDisplay.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineBlockDisplay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBoat.java b/server/src/main/java/de/bauhd/sculk/entity/MineBoat.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineBoat.java rename to server/src/main/java/de/bauhd/sculk/entity/MineBoat.java index e717cd48..994b8ebb 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineBoat.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineBoat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCamel.java b/server/src/main/java/de/bauhd/sculk/entity/MineCamel.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineCamel.java rename to server/src/main/java/de/bauhd/sculk/entity/MineCamel.java index 97e6109f..ee417e83 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCamel.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineCamel.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCat.java b/server/src/main/java/de/bauhd/sculk/entity/MineCat.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineCat.java rename to server/src/main/java/de/bauhd/sculk/entity/MineCat.java index 438e1c11..cb99ef0a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCat.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineCat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCaveSpider.java b/server/src/main/java/de/bauhd/sculk/entity/MineCaveSpider.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineCaveSpider.java rename to server/src/main/java/de/bauhd/sculk/entity/MineCaveSpider.java index 9d8183af..4b457d37 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCaveSpider.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineCaveSpider.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineChestBoat.java b/server/src/main/java/de/bauhd/sculk/entity/MineChestBoat.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineChestBoat.java rename to server/src/main/java/de/bauhd/sculk/entity/MineChestBoat.java index a6eff5df..5550d6d0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineChestBoat.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineChestBoat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineChestMinecart.java b/server/src/main/java/de/bauhd/sculk/entity/MineChestMinecart.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineChestMinecart.java rename to server/src/main/java/de/bauhd/sculk/entity/MineChestMinecart.java index bc9bab8a..f675288d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineChestMinecart.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineChestMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineChicken.java b/server/src/main/java/de/bauhd/sculk/entity/MineChicken.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineChicken.java rename to server/src/main/java/de/bauhd/sculk/entity/MineChicken.java index d927ab0f..7779e6cd 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineChicken.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineChicken.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCod.java b/server/src/main/java/de/bauhd/sculk/entity/MineCod.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineCod.java rename to server/src/main/java/de/bauhd/sculk/entity/MineCod.java index 8fe17d40..64f9111c 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCod.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineCod.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCommandBlockMinecart.java b/server/src/main/java/de/bauhd/sculk/entity/MineCommandBlockMinecart.java similarity index 86% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineCommandBlockMinecart.java rename to server/src/main/java/de/bauhd/sculk/entity/MineCommandBlockMinecart.java index 0e0b61b5..4a7a1e96 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCommandBlockMinecart.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineCommandBlockMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCow.java b/server/src/main/java/de/bauhd/sculk/entity/MineCow.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineCow.java rename to server/src/main/java/de/bauhd/sculk/entity/MineCow.java index 519ed3b3..97cddeef 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCow.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineCow.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCreeper.java b/server/src/main/java/de/bauhd/sculk/entity/MineCreeper.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineCreeper.java rename to server/src/main/java/de/bauhd/sculk/entity/MineCreeper.java index 1851cdcc..3b724b07 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineCreeper.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineCreeper.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDolphin.java b/server/src/main/java/de/bauhd/sculk/entity/MineDolphin.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineDolphin.java rename to server/src/main/java/de/bauhd/sculk/entity/MineDolphin.java index 24df8e65..a2381e2e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDolphin.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineDolphin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDonkey.java b/server/src/main/java/de/bauhd/sculk/entity/MineDonkey.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineDonkey.java rename to server/src/main/java/de/bauhd/sculk/entity/MineDonkey.java index 097186ce..2e26d02e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDonkey.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineDonkey.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDragonFireball.java b/server/src/main/java/de/bauhd/sculk/entity/MineDragonFireball.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineDragonFireball.java rename to server/src/main/java/de/bauhd/sculk/entity/MineDragonFireball.java index 46e2f9c9..e906fcc0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDragonFireball.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineDragonFireball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDrowned.java b/server/src/main/java/de/bauhd/sculk/entity/MineDrowned.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineDrowned.java rename to server/src/main/java/de/bauhd/sculk/entity/MineDrowned.java index dc76259b..dd5fc490 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineDrowned.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineDrowned.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEgg.java b/server/src/main/java/de/bauhd/sculk/entity/MineEgg.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEgg.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEgg.java index 88a7d382..77a2cf94 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEgg.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEgg.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineElderGuardian.java b/server/src/main/java/de/bauhd/sculk/entity/MineElderGuardian.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineElderGuardian.java rename to server/src/main/java/de/bauhd/sculk/entity/MineElderGuardian.java index a6a7eb35..2d7d8769 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineElderGuardian.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineElderGuardian.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEndCrystal.java b/server/src/main/java/de/bauhd/sculk/entity/MineEndCrystal.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEndCrystal.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEndCrystal.java index ceec4bc0..44638cb6 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEndCrystal.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEndCrystal.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderDragon.java b/server/src/main/java/de/bauhd/sculk/entity/MineEnderDragon.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderDragon.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEnderDragon.java index 0cdf2f6a..b36ccbd9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderDragon.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEnderDragon.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderPearl.java b/server/src/main/java/de/bauhd/sculk/entity/MineEnderPearl.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderPearl.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEnderPearl.java index 46b84bbe..70254fb0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderPearl.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEnderPearl.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderman.java b/server/src/main/java/de/bauhd/sculk/entity/MineEnderman.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderman.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEnderman.java index 25dc3c29..fcd1a5ee 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEnderman.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEnderman.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEndermite.java b/server/src/main/java/de/bauhd/sculk/entity/MineEndermite.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEndermite.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEndermite.java index bb93c6b6..a50d65b5 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEndermite.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEndermite.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEvoker.java b/server/src/main/java/de/bauhd/sculk/entity/MineEvoker.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEvoker.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEvoker.java index d0043d4b..1889a240 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEvoker.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEvoker.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEvokerFangs.java b/server/src/main/java/de/bauhd/sculk/entity/MineEvokerFangs.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEvokerFangs.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEvokerFangs.java index 9359ec56..c0876037 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEvokerFangs.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEvokerFangs.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineExperienceBottle.java b/server/src/main/java/de/bauhd/sculk/entity/MineExperienceBottle.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineExperienceBottle.java rename to server/src/main/java/de/bauhd/sculk/entity/MineExperienceBottle.java index 5f813a12..bb869c48 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineExperienceBottle.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineExperienceBottle.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineExperienceOrb.java b/server/src/main/java/de/bauhd/sculk/entity/MineExperienceOrb.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineExperienceOrb.java rename to server/src/main/java/de/bauhd/sculk/entity/MineExperienceOrb.java index a943e3b6..cc173671 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineExperienceOrb.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineExperienceOrb.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEyeOfEnder.java b/server/src/main/java/de/bauhd/sculk/entity/MineEyeOfEnder.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineEyeOfEnder.java rename to server/src/main/java/de/bauhd/sculk/entity/MineEyeOfEnder.java index 54d86237..a6154d4a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineEyeOfEnder.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineEyeOfEnder.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFallingBlock.java b/server/src/main/java/de/bauhd/sculk/entity/MineFallingBlock.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineFallingBlock.java rename to server/src/main/java/de/bauhd/sculk/entity/MineFallingBlock.java index aa691938..a217b1cb 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFallingBlock.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineFallingBlock.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFireball.java b/server/src/main/java/de/bauhd/sculk/entity/MineFireball.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineFireball.java rename to server/src/main/java/de/bauhd/sculk/entity/MineFireball.java index 2700f84d..3999a516 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFireball.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineFireball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFireworkRocket.java b/server/src/main/java/de/bauhd/sculk/entity/MineFireworkRocket.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineFireworkRocket.java rename to server/src/main/java/de/bauhd/sculk/entity/MineFireworkRocket.java index 2d13622a..9e99d115 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFireworkRocket.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineFireworkRocket.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFishingBobber.java b/server/src/main/java/de/bauhd/sculk/entity/MineFishingBobber.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineFishingBobber.java rename to server/src/main/java/de/bauhd/sculk/entity/MineFishingBobber.java index 76c18e6d..10cfb75b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFishingBobber.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineFishingBobber.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFox.java b/server/src/main/java/de/bauhd/sculk/entity/MineFox.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineFox.java rename to server/src/main/java/de/bauhd/sculk/entity/MineFox.java index 8d34a465..9a54b8d2 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFox.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineFox.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFrog.java b/server/src/main/java/de/bauhd/sculk/entity/MineFrog.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineFrog.java rename to server/src/main/java/de/bauhd/sculk/entity/MineFrog.java index 94bb0554..bb156fa0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFrog.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineFrog.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFurnaceMinecart.java b/server/src/main/java/de/bauhd/sculk/entity/MineFurnaceMinecart.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineFurnaceMinecart.java rename to server/src/main/java/de/bauhd/sculk/entity/MineFurnaceMinecart.java index 6d375778..f31a2eac 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineFurnaceMinecart.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineFurnaceMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGhast.java b/server/src/main/java/de/bauhd/sculk/entity/MineGhast.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineGhast.java rename to server/src/main/java/de/bauhd/sculk/entity/MineGhast.java index 9959c483..28bbd5c5 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGhast.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineGhast.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGiant.java b/server/src/main/java/de/bauhd/sculk/entity/MineGiant.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineGiant.java rename to server/src/main/java/de/bauhd/sculk/entity/MineGiant.java index b9ddd727..7f3db125 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGiant.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineGiant.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGlowItemFrame.java b/server/src/main/java/de/bauhd/sculk/entity/MineGlowItemFrame.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineGlowItemFrame.java rename to server/src/main/java/de/bauhd/sculk/entity/MineGlowItemFrame.java index 0d791836..4b53d54f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGlowItemFrame.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineGlowItemFrame.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGlowSquid.java b/server/src/main/java/de/bauhd/sculk/entity/MineGlowSquid.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineGlowSquid.java rename to server/src/main/java/de/bauhd/sculk/entity/MineGlowSquid.java index 16cdbcee..ed01039a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGlowSquid.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineGlowSquid.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGoat.java b/server/src/main/java/de/bauhd/sculk/entity/MineGoat.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineGoat.java rename to server/src/main/java/de/bauhd/sculk/entity/MineGoat.java index d858ca42..ea5ab52a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGoat.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineGoat.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGuardian.java b/server/src/main/java/de/bauhd/sculk/entity/MineGuardian.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineGuardian.java rename to server/src/main/java/de/bauhd/sculk/entity/MineGuardian.java index 02024e05..72b74698 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineGuardian.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineGuardian.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHoglin.java b/server/src/main/java/de/bauhd/sculk/entity/MineHoglin.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineHoglin.java rename to server/src/main/java/de/bauhd/sculk/entity/MineHoglin.java index 275be20a..7fb513a4 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHoglin.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineHoglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHopperMinecart.java b/server/src/main/java/de/bauhd/sculk/entity/MineHopperMinecart.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineHopperMinecart.java rename to server/src/main/java/de/bauhd/sculk/entity/MineHopperMinecart.java index 4c7f5a23..40740c72 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHopperMinecart.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineHopperMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHorse.java b/server/src/main/java/de/bauhd/sculk/entity/MineHorse.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineHorse.java rename to server/src/main/java/de/bauhd/sculk/entity/MineHorse.java index c0075370..394a9358 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHorse.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineHorse.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHusk.java b/server/src/main/java/de/bauhd/sculk/entity/MineHusk.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineHusk.java rename to server/src/main/java/de/bauhd/sculk/entity/MineHusk.java index 0365ecb6..bf0114f8 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineHusk.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineHusk.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineIllusioner.java b/server/src/main/java/de/bauhd/sculk/entity/MineIllusioner.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineIllusioner.java rename to server/src/main/java/de/bauhd/sculk/entity/MineIllusioner.java index f01dede9..981802a9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineIllusioner.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineIllusioner.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineInteraction.java b/server/src/main/java/de/bauhd/sculk/entity/MineInteraction.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineInteraction.java rename to server/src/main/java/de/bauhd/sculk/entity/MineInteraction.java index 55735f19..a0a6bf74 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineInteraction.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineInteraction.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineIronGolem.java b/server/src/main/java/de/bauhd/sculk/entity/MineIronGolem.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineIronGolem.java rename to server/src/main/java/de/bauhd/sculk/entity/MineIronGolem.java index d914e706..5a575e86 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineIronGolem.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineIronGolem.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineItem.java b/server/src/main/java/de/bauhd/sculk/entity/MineItem.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineItem.java rename to server/src/main/java/de/bauhd/sculk/entity/MineItem.java index 12bc5918..2fde4847 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineItem.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineItem.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineItemDisplay.java b/server/src/main/java/de/bauhd/sculk/entity/MineItemDisplay.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineItemDisplay.java rename to server/src/main/java/de/bauhd/sculk/entity/MineItemDisplay.java index fa476533..5ab86698 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineItemDisplay.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineItemDisplay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineItemFrame.java b/server/src/main/java/de/bauhd/sculk/entity/MineItemFrame.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineItemFrame.java rename to server/src/main/java/de/bauhd/sculk/entity/MineItemFrame.java index 47842b1b..00a0cf46 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineItemFrame.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineItemFrame.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLLama.java b/server/src/main/java/de/bauhd/sculk/entity/MineLLama.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineLLama.java rename to server/src/main/java/de/bauhd/sculk/entity/MineLLama.java index 10a11312..9186909b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLLama.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineLLama.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLeashKnot.java b/server/src/main/java/de/bauhd/sculk/entity/MineLeashKnot.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineLeashKnot.java rename to server/src/main/java/de/bauhd/sculk/entity/MineLeashKnot.java index cfbff48f..1b088dd8 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLeashKnot.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineLeashKnot.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLightningBolt.java b/server/src/main/java/de/bauhd/sculk/entity/MineLightningBolt.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineLightningBolt.java rename to server/src/main/java/de/bauhd/sculk/entity/MineLightningBolt.java index 835dd5e2..c126c290 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLightningBolt.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineLightningBolt.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLlamaSpit.java b/server/src/main/java/de/bauhd/sculk/entity/MineLlamaSpit.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineLlamaSpit.java rename to server/src/main/java/de/bauhd/sculk/entity/MineLlamaSpit.java index 63ce8f20..db1665e1 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineLlamaSpit.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineLlamaSpit.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMagmaCube.java b/server/src/main/java/de/bauhd/sculk/entity/MineMagmaCube.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineMagmaCube.java rename to server/src/main/java/de/bauhd/sculk/entity/MineMagmaCube.java index 3ad36125..7deef866 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMagmaCube.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineMagmaCube.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMinecart.java b/server/src/main/java/de/bauhd/sculk/entity/MineMinecart.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineMinecart.java rename to server/src/main/java/de/bauhd/sculk/entity/MineMinecart.java index ed7a444f..abd222ac 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMinecart.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMooshroom.java b/server/src/main/java/de/bauhd/sculk/entity/MineMooshroom.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineMooshroom.java rename to server/src/main/java/de/bauhd/sculk/entity/MineMooshroom.java index e5191fa1..cb721a8a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMooshroom.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineMooshroom.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMule.java b/server/src/main/java/de/bauhd/sculk/entity/MineMule.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineMule.java rename to server/src/main/java/de/bauhd/sculk/entity/MineMule.java index 300de105..fd06c86d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineMule.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineMule.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineOcelot.java b/server/src/main/java/de/bauhd/sculk/entity/MineOcelot.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineOcelot.java rename to server/src/main/java/de/bauhd/sculk/entity/MineOcelot.java index ca339f84..c9dd4398 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineOcelot.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineOcelot.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePainting.java b/server/src/main/java/de/bauhd/sculk/entity/MinePainting.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePainting.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePainting.java index 2dbd4f1a..7c713a2b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePainting.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePainting.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePanda.java b/server/src/main/java/de/bauhd/sculk/entity/MinePanda.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePanda.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePanda.java index 253e752a..c95c2a33 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePanda.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePanda.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineParrot.java b/server/src/main/java/de/bauhd/sculk/entity/MineParrot.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineParrot.java rename to server/src/main/java/de/bauhd/sculk/entity/MineParrot.java index 22072766..f1d67f22 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineParrot.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineParrot.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePhantom.java b/server/src/main/java/de/bauhd/sculk/entity/MinePhantom.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePhantom.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePhantom.java index e09d8fde..792d37fe 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePhantom.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePhantom.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePig.java b/server/src/main/java/de/bauhd/sculk/entity/MinePig.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePig.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePig.java index 7a052e89..193590b2 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePig.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePig.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePiglin.java b/server/src/main/java/de/bauhd/sculk/entity/MinePiglin.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePiglin.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePiglin.java index 1d3772b5..f2adf2db 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePiglin.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePiglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePiglinBrute.java b/server/src/main/java/de/bauhd/sculk/entity/MinePiglinBrute.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePiglinBrute.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePiglinBrute.java index 32f4ec1a..7086682d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePiglinBrute.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePiglinBrute.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePillager.java b/server/src/main/java/de/bauhd/sculk/entity/MinePillager.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePillager.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePillager.java index f0b39b8d..245aa6f5 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePillager.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePillager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePolarBear.java b/server/src/main/java/de/bauhd/sculk/entity/MinePolarBear.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePolarBear.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePolarBear.java index 3e685a49..6bdc83dd 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePolarBear.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePolarBear.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePotion.java b/server/src/main/java/de/bauhd/sculk/entity/MinePotion.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePotion.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePotion.java index 127b75db..f7708528 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePotion.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePotion.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePufferfish.java b/server/src/main/java/de/bauhd/sculk/entity/MinePufferfish.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MinePufferfish.java rename to server/src/main/java/de/bauhd/sculk/entity/MinePufferfish.java index e70eab81..f68c7791 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MinePufferfish.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MinePufferfish.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineRabbit.java b/server/src/main/java/de/bauhd/sculk/entity/MineRabbit.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineRabbit.java rename to server/src/main/java/de/bauhd/sculk/entity/MineRabbit.java index d4b12420..0aedb2f9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineRabbit.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineRabbit.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineRavager.java b/server/src/main/java/de/bauhd/sculk/entity/MineRavager.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineRavager.java rename to server/src/main/java/de/bauhd/sculk/entity/MineRavager.java index efc89440..1ea3ff37 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineRavager.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineRavager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSalmon.java b/server/src/main/java/de/bauhd/sculk/entity/MineSalmon.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSalmon.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSalmon.java index c56c5709..c6d23fac 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSalmon.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSalmon.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSheep.java b/server/src/main/java/de/bauhd/sculk/entity/MineSheep.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSheep.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSheep.java index e5a4a224..5f01d957 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSheep.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSheep.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineShulker.java b/server/src/main/java/de/bauhd/sculk/entity/MineShulker.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineShulker.java rename to server/src/main/java/de/bauhd/sculk/entity/MineShulker.java index 473e4271..b81bdc0f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineShulker.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineShulker.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSilverfish.java b/server/src/main/java/de/bauhd/sculk/entity/MineSilverfish.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSilverfish.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSilverfish.java index 23ee924d..1f3de1a0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSilverfish.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSilverfish.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSkeleton.java b/server/src/main/java/de/bauhd/sculk/entity/MineSkeleton.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSkeleton.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSkeleton.java index fca81997..59a2c1e4 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSkeleton.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSkeleton.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSkeletonHorse.java b/server/src/main/java/de/bauhd/sculk/entity/MineSkeletonHorse.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSkeletonHorse.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSkeletonHorse.java index b23a806e..a345e06f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSkeletonHorse.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSkeletonHorse.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSkulkerBullet.java b/server/src/main/java/de/bauhd/sculk/entity/MineSkulkerBullet.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSkulkerBullet.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSkulkerBullet.java index d2228b28..26dc24a9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSkulkerBullet.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSkulkerBullet.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSlime.java b/server/src/main/java/de/bauhd/sculk/entity/MineSlime.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSlime.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSlime.java index 72ddf8e5..d90387d1 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSlime.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSlime.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSmallFireball.java b/server/src/main/java/de/bauhd/sculk/entity/MineSmallFireball.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSmallFireball.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSmallFireball.java index 4daf050f..bb34d689 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSmallFireball.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSmallFireball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSniffer.java b/server/src/main/java/de/bauhd/sculk/entity/MineSniffer.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSniffer.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSniffer.java index fda66d10..6f9bbcf0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSniffer.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSniffer.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSnowGolem.java b/server/src/main/java/de/bauhd/sculk/entity/MineSnowGolem.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSnowGolem.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSnowGolem.java index d859f7c9..cc0b68aa 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSnowGolem.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSnowGolem.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSnowball.java b/server/src/main/java/de/bauhd/sculk/entity/MineSnowball.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSnowball.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSnowball.java index 0941b8a9..fcf1550c 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSnowball.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSnowball.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSpawnerMinecart.java b/server/src/main/java/de/bauhd/sculk/entity/MineSpawnerMinecart.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSpawnerMinecart.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSpawnerMinecart.java index 205a6af8..545a883e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSpawnerMinecart.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSpawnerMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSpectralArrow.java b/server/src/main/java/de/bauhd/sculk/entity/MineSpectralArrow.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSpectralArrow.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSpectralArrow.java index 28a80c14..0532f291 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSpectralArrow.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSpectralArrow.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSpider.java b/server/src/main/java/de/bauhd/sculk/entity/MineSpider.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSpider.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSpider.java index e3712be7..5d390375 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSpider.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSpider.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSquid.java b/server/src/main/java/de/bauhd/sculk/entity/MineSquid.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineSquid.java rename to server/src/main/java/de/bauhd/sculk/entity/MineSquid.java index c93eae01..47b050bb 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineSquid.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineSquid.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineStray.java b/server/src/main/java/de/bauhd/sculk/entity/MineStray.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineStray.java rename to server/src/main/java/de/bauhd/sculk/entity/MineStray.java index 1249923b..ea31535f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineStray.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineStray.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineStrider.java b/server/src/main/java/de/bauhd/sculk/entity/MineStrider.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineStrider.java rename to server/src/main/java/de/bauhd/sculk/entity/MineStrider.java index 0fd38d08..922840ea 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineStrider.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineStrider.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTadpole.java b/server/src/main/java/de/bauhd/sculk/entity/MineTadpole.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTadpole.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTadpole.java index 674b72a6..84f4bd2f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTadpole.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTadpole.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTextDisplay.java b/server/src/main/java/de/bauhd/sculk/entity/MineTextDisplay.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTextDisplay.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTextDisplay.java index fdc164aa..1c4bca31 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTextDisplay.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTextDisplay.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTnt.java b/server/src/main/java/de/bauhd/sculk/entity/MineTnt.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTnt.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTnt.java index 9ddc5759..cdddf1ed 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTnt.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTnt.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTntMinecart.java b/server/src/main/java/de/bauhd/sculk/entity/MineTntMinecart.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTntMinecart.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTntMinecart.java index aeca798f..d3d51266 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTntMinecart.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTntMinecart.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTraderLlama.java b/server/src/main/java/de/bauhd/sculk/entity/MineTraderLlama.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTraderLlama.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTraderLlama.java index 8ad0b2fa..c7159a4e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTraderLlama.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTraderLlama.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTrident.java b/server/src/main/java/de/bauhd/sculk/entity/MineTrident.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTrident.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTrident.java index b225d2a6..f6c4dff1 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTrident.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTrident.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTropicalFish.java b/server/src/main/java/de/bauhd/sculk/entity/MineTropicalFish.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTropicalFish.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTropicalFish.java index 185070fb..71248263 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTropicalFish.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTropicalFish.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTurtle.java b/server/src/main/java/de/bauhd/sculk/entity/MineTurtle.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineTurtle.java rename to server/src/main/java/de/bauhd/sculk/entity/MineTurtle.java index ef3fb2ce..2a4984aa 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineTurtle.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineTurtle.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineVex.java b/server/src/main/java/de/bauhd/sculk/entity/MineVex.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineVex.java rename to server/src/main/java/de/bauhd/sculk/entity/MineVex.java index d8a22836..1783e388 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineVex.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineVex.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineVillager.java b/server/src/main/java/de/bauhd/sculk/entity/MineVillager.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineVillager.java rename to server/src/main/java/de/bauhd/sculk/entity/MineVillager.java index b64bda86..9d6f7924 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineVillager.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineVillager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineVindicator.java b/server/src/main/java/de/bauhd/sculk/entity/MineVindicator.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineVindicator.java rename to server/src/main/java/de/bauhd/sculk/entity/MineVindicator.java index 692a1842..1bdbab5f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineVindicator.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineVindicator.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWanderingTrader.java b/server/src/main/java/de/bauhd/sculk/entity/MineWanderingTrader.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineWanderingTrader.java rename to server/src/main/java/de/bauhd/sculk/entity/MineWanderingTrader.java index 4be9a4d4..eaf13081 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWanderingTrader.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineWanderingTrader.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWarden.java b/server/src/main/java/de/bauhd/sculk/entity/MineWarden.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineWarden.java rename to server/src/main/java/de/bauhd/sculk/entity/MineWarden.java index 04b9e41c..22ed635a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWarden.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineWarden.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWitch.java b/server/src/main/java/de/bauhd/sculk/entity/MineWitch.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineWitch.java rename to server/src/main/java/de/bauhd/sculk/entity/MineWitch.java index 9bbfd63c..5348b849 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWitch.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineWitch.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWitherSkeleton.java b/server/src/main/java/de/bauhd/sculk/entity/MineWitherSkeleton.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineWitherSkeleton.java rename to server/src/main/java/de/bauhd/sculk/entity/MineWitherSkeleton.java index e07954e9..2bfc7ca8 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWitherSkeleton.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineWitherSkeleton.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWitherSkull.java b/server/src/main/java/de/bauhd/sculk/entity/MineWitherSkull.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineWitherSkull.java rename to server/src/main/java/de/bauhd/sculk/entity/MineWitherSkull.java index 314632c1..e84bf07a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWitherSkull.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineWitherSkull.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWolf.java b/server/src/main/java/de/bauhd/sculk/entity/MineWolf.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineWolf.java rename to server/src/main/java/de/bauhd/sculk/entity/MineWolf.java index 5bf9a311..5e9deec2 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineWolf.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineWolf.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZoglin.java b/server/src/main/java/de/bauhd/sculk/entity/MineZoglin.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineZoglin.java rename to server/src/main/java/de/bauhd/sculk/entity/MineZoglin.java index 7f138987..06fc93a6 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZoglin.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineZoglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombie.java b/server/src/main/java/de/bauhd/sculk/entity/MineZombie.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineZombie.java rename to server/src/main/java/de/bauhd/sculk/entity/MineZombie.java index fb5feb01..1f9d59c5 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombie.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineZombie.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombieHorse.java b/server/src/main/java/de/bauhd/sculk/entity/MineZombieHorse.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineZombieHorse.java rename to server/src/main/java/de/bauhd/sculk/entity/MineZombieHorse.java index 3d0259b9..515b76af 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombieHorse.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineZombieHorse.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombieVillager.java b/server/src/main/java/de/bauhd/sculk/entity/MineZombieVillager.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineZombieVillager.java rename to server/src/main/java/de/bauhd/sculk/entity/MineZombieVillager.java index 21013844..ecdf2bf4 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombieVillager.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineZombieVillager.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombifiedPiglin.java b/server/src/main/java/de/bauhd/sculk/entity/MineZombifiedPiglin.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/entity/MineZombifiedPiglin.java rename to server/src/main/java/de/bauhd/sculk/entity/MineZombifiedPiglin.java index 87584012..87a4e0ed 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/MineZombifiedPiglin.java +++ b/server/src/main/java/de/bauhd/sculk/entity/MineZombifiedPiglin.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.entity; +package de.bauhd.sculk.entity; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/player/ClientInformationWrapper.java b/server/src/main/java/de/bauhd/sculk/entity/player/ClientInformationWrapper.java similarity index 93% rename from server/src/main/java/de/bauhd/minecraft/server/entity/player/ClientInformationWrapper.java rename to server/src/main/java/de/bauhd/sculk/entity/player/ClientInformationWrapper.java index 04ad80c8..53db5588 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/player/ClientInformationWrapper.java +++ b/server/src/main/java/de/bauhd/sculk/entity/player/ClientInformationWrapper.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.entity.player; +package de.bauhd.sculk.entity.player; -import de.bauhd.minecraft.server.protocol.packet.play.ClientInformation; +import de.bauhd.sculk.protocol.packet.play.ClientInformation; import org.jetbrains.annotations.NotNull; import java.util.Locale; diff --git a/server/src/main/java/de/bauhd/minecraft/server/entity/player/MinecraftPlayer.java b/server/src/main/java/de/bauhd/sculk/entity/player/MinecraftPlayer.java similarity index 88% rename from server/src/main/java/de/bauhd/minecraft/server/entity/player/MinecraftPlayer.java rename to server/src/main/java/de/bauhd/sculk/entity/player/MinecraftPlayer.java index c19ef6e7..4bd56510 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/entity/player/MinecraftPlayer.java +++ b/server/src/main/java/de/bauhd/sculk/entity/player/MinecraftPlayer.java @@ -1,22 +1,22 @@ -package de.bauhd.minecraft.server.entity.player; - -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.container.Container; -import de.bauhd.minecraft.server.container.MineContainer; -import de.bauhd.minecraft.server.container.MineInventory; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.entity.AbstractLivingEntity; -import de.bauhd.minecraft.server.entity.EntityType; -import de.bauhd.minecraft.server.protocol.MineConnection; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.login.Disconnect; -import de.bauhd.minecraft.server.protocol.packet.play.*; -import de.bauhd.minecraft.server.protocol.packet.play.container.ContainerContent; -import de.bauhd.minecraft.server.protocol.packet.play.container.OpenScreen; -import de.bauhd.minecraft.server.protocol.packet.play.title.Subtitle; -import de.bauhd.minecraft.server.protocol.packet.play.title.TitleAnimationTimes; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.World; +package de.bauhd.sculk.entity.player; + +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.container.Container; +import de.bauhd.sculk.container.MineContainer; +import de.bauhd.sculk.container.MineInventory; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.entity.AbstractLivingEntity; +import de.bauhd.sculk.entity.EntityType; +import de.bauhd.sculk.protocol.MineConnection; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.login.Disconnect; +import de.bauhd.sculk.protocol.packet.play.*; +import de.bauhd.sculk.protocol.packet.play.container.ContainerContent; +import de.bauhd.sculk.protocol.packet.play.container.OpenScreen; +import de.bauhd.sculk.protocol.packet.play.title.Subtitle; +import de.bauhd.sculk.protocol.packet.play.title.TitleAnimationTimes; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.World; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.permission.PermissionChecker; @@ -40,7 +40,7 @@ public final class MinecraftPlayer extends AbstractLivingEntity implements Playe .withDynamic(PermissionChecker.POINTER, () -> this.permissionChecker) .build(); - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final MineConnection connection; private final GameProfile profile; private final ClientInformationWrapper settings = new ClientInformationWrapper(); @@ -58,7 +58,7 @@ public final class MinecraftPlayer extends AbstractLivingEntity implements Playe private boolean instantBreak; private float viewModifier = 0.01F; - public MinecraftPlayer(final AdvancedMinecraftServer server, final MineConnection connection, final GameProfile profile) { + public MinecraftPlayer(final SculkMinecraftServer server, final MineConnection connection, final GameProfile profile) { super(profile.uniqueId()); this.server = server; this.connection = connection; @@ -230,7 +230,7 @@ public void sendPlayerListHeaderAndFooter(@NotNull Component header, @NotNull Co @Override public void sendTitlePart(@NotNull TitlePart part, @NotNull T value) { if (part == TitlePart.TITLE) { - this.send(new de.bauhd.minecraft.server.protocol.packet.play.title.Title((Component) value)); + this.send(new de.bauhd.sculk.protocol.packet.play.title.Title((Component) value)); } else if (part == TitlePart.SUBTITLE) { this.send(new Subtitle((Component) value)); } else if (part == TitlePart.TIMES) { diff --git a/server/src/main/java/de/bauhd/minecraft/server/event/EventThreadFactory.java b/server/src/main/java/de/bauhd/sculk/event/EventThreadFactory.java similarity index 92% rename from server/src/main/java/de/bauhd/minecraft/server/event/EventThreadFactory.java rename to server/src/main/java/de/bauhd/sculk/event/EventThreadFactory.java index f7dfa002..87c8bfe6 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/event/EventThreadFactory.java +++ b/server/src/main/java/de/bauhd/sculk/event/EventThreadFactory.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.event; +package de.bauhd.sculk.event; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/event/MineEventHandler.java b/server/src/main/java/de/bauhd/sculk/event/MineEventHandler.java similarity index 98% rename from server/src/main/java/de/bauhd/minecraft/server/event/MineEventHandler.java rename to server/src/main/java/de/bauhd/sculk/event/MineEventHandler.java index af6d8ced..c61c232f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/event/MineEventHandler.java +++ b/server/src/main/java/de/bauhd/sculk/event/MineEventHandler.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.event; +package de.bauhd.sculk.event; -import de.bauhd.minecraft.server.plugin.Plugin; +import de.bauhd.sculk.plugin.Plugin; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/json/GameProfileDeserializer.java b/server/src/main/java/de/bauhd/sculk/json/GameProfileDeserializer.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/json/GameProfileDeserializer.java rename to server/src/main/java/de/bauhd/sculk/json/GameProfileDeserializer.java index 5ad022f9..831bb2f9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/json/GameProfileDeserializer.java +++ b/server/src/main/java/de/bauhd/sculk/json/GameProfileDeserializer.java @@ -1,13 +1,13 @@ -package de.bauhd.minecraft.server.json; +package de.bauhd.sculk.json; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; import com.google.gson.reflect.TypeToken; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.entity.player.GameProfile; -import de.bauhd.minecraft.server.util.MojangUtil; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.entity.player.GameProfile; +import de.bauhd.sculk.util.MojangUtil; import java.lang.reflect.Type; import java.util.List; @@ -22,7 +22,7 @@ public GameProfile deserialize(JsonElement jsonElement, Type type, JsonDeseriali return new GameProfile( MojangUtil.fromMojang(json.get("id").getAsString()), json.get("name").getAsString(), - List.of(AdvancedMinecraftServer.GSON.fromJson(json.get("properties"), PROPERTY_ARRAY)) + List.of(SculkMinecraftServer.GSON.fromJson(json.get("properties"), PROPERTY_ARRAY)) ); } } diff --git a/server/src/main/java/de/bauhd/minecraft/server/json/GameProfilePropertyDeserializer.java b/server/src/main/java/de/bauhd/sculk/json/GameProfilePropertyDeserializer.java similarity index 88% rename from server/src/main/java/de/bauhd/minecraft/server/json/GameProfilePropertyDeserializer.java rename to server/src/main/java/de/bauhd/sculk/json/GameProfilePropertyDeserializer.java index 4cfb208b..f925f409 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/json/GameProfilePropertyDeserializer.java +++ b/server/src/main/java/de/bauhd/sculk/json/GameProfilePropertyDeserializer.java @@ -1,10 +1,10 @@ -package de.bauhd.minecraft.server.json; +package de.bauhd.sculk.json; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; import com.google.gson.JsonParseException; -import de.bauhd.minecraft.server.entity.player.GameProfile; +import de.bauhd.sculk.entity.player.GameProfile; import java.lang.reflect.Type; diff --git a/server/src/main/java/de/bauhd/minecraft/server/plugin/MinePluginHandler.java b/server/src/main/java/de/bauhd/sculk/plugin/MinePluginHandler.java similarity index 93% rename from server/src/main/java/de/bauhd/minecraft/server/plugin/MinePluginHandler.java rename to server/src/main/java/de/bauhd/sculk/plugin/MinePluginHandler.java index 93135a2b..3b528e37 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/plugin/MinePluginHandler.java +++ b/server/src/main/java/de/bauhd/sculk/plugin/MinePluginHandler.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.plugin; +package de.bauhd.sculk.plugin; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; +import de.bauhd.sculk.SculkMinecraftServer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; @@ -24,10 +24,10 @@ public final class MinePluginHandler implements PluginHandler { private static final Logger LOGGER = LogManager.getLogger(PluginHandler.class); private static final Path PLUGINS_DIRECTORY = Path.of("plugins"); - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final Map plugins = new HashMap<>(); - public MinePluginHandler(final AdvancedMinecraftServer server) { + public MinePluginHandler(final SculkMinecraftServer server) { this.server = server; try { if (Files.notExists(PLUGINS_DIRECTORY)) { diff --git a/server/src/main/java/de/bauhd/sculk/plugin/PluginClassLoader.java b/server/src/main/java/de/bauhd/sculk/plugin/PluginClassLoader.java new file mode 100644 index 00000000..23415b13 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/plugin/PluginClassLoader.java @@ -0,0 +1,51 @@ +package de.bauhd.sculk.plugin; + +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +public final class PluginClassLoader extends URLClassLoader { + + private static final List CLASS_LOADERS = new CopyOnWriteArrayList<>(); + + static { + registerAsParallelCapable(); + } + + public PluginClassLoader(URL... urls) { + super(urls); + CLASS_LOADERS.add(this); + } + + @Override + public void addURL(URL url) { + super.addURL(url); + } + + @Override + protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException { + return this.loadClass(name, resolve, true); + } + + private Class loadClass(String name, boolean resolve, boolean deep) throws ClassNotFoundException { + try { + super.loadClass(name, resolve); + } catch (ClassNotFoundException ignored) {} + if (deep) { + for (final var classLoader : CLASS_LOADERS) { + try { + classLoader.loadClass(name, resolve, false); + } catch (ClassNotFoundException ignored) {} + } + } + throw new ClassNotFoundException(name); + } + + @Override + public void close() throws IOException { + CLASS_LOADERS.remove(this); + super.close(); + } +} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/Buffer.java b/server/src/main/java/de/bauhd/sculk/protocol/Buffer.java similarity index 90% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/Buffer.java rename to server/src/main/java/de/bauhd/sculk/protocol/Buffer.java index 90a2bfc3..87a2778f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/Buffer.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/Buffer.java @@ -1,13 +1,14 @@ -package de.bauhd.minecraft.server.protocol; - -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.container.item.Material; -import de.bauhd.minecraft.server.protocol.packet.PacketUtils; -import de.bauhd.minecraft.server.util.Utf8; -import de.bauhd.minecraft.server.world.Position; -import io.netty5.buffer.BufferInputStream; -import io.netty5.buffer.BufferOutputStream; -import io.netty5.handler.codec.EncoderException; +package de.bauhd.sculk.protocol; + +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.container.item.Material; +import de.bauhd.sculk.protocol.packet.PacketUtils; +import de.bauhd.sculk.util.Utf8; +import de.bauhd.sculk.world.Position; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufInputStream; +import io.netty.buffer.ByteBufOutputStream; +import io.netty.handler.codec.EncoderException; import net.kyori.adventure.nbt.BinaryTagIO; import net.kyori.adventure.nbt.CompoundBinaryTag; import net.kyori.adventure.text.Component; @@ -23,18 +24,24 @@ import static java.nio.charset.StandardCharsets.UTF_8; -public record Buffer(io.netty5.buffer.Buffer buf) { +public final class Buffer { private static final int STRING_CAPACITY = 65536; private static final GsonComponentSerializer PRE_1_16_SERIALIZER = GsonComponentSerializer.colorDownsamplingGson(); private static final GsonComponentSerializer MODERN_SERIALIZER = GsonComponentSerializer.gson(); + private final ByteBuf buf; + + public Buffer(final ByteBuf buf) { + this.buf = buf; + } + public int readUnsignedByte() { return this.buf.readUnsignedByte(); } public @NotNull Buffer writeUnsignedByte(int value) { - this.buf.writeUnsignedByte(value); + this.buf.writeByte(value); return this; } @@ -75,11 +82,6 @@ public int readUnsignedShort() { return this.buf.readUnsignedShort(); } - public @NotNull Buffer writeUnsignedShort(int value) { - this.buf.writeUnsignedShort(value); - return this; - } - public int readInt() { return this.buf.readInt(); } @@ -181,7 +183,7 @@ public byte[] readByteArray() { public @NotNull CompoundBinaryTag readCompoundTag() { try { - return BinaryTagIO.reader().read((DataInput) new BufferInputStream(buf.send())); + return BinaryTagIO.reader().read((DataInput) new ByteBufInputStream(this.buf)); } catch (IOException e) { return CompoundBinaryTag.empty(); } @@ -190,7 +192,7 @@ public byte[] readByteArray() { public @NotNull Buffer writeCompoundTag(final CompoundBinaryTag binaryTag) { try { - BinaryTagIO.writer().write(binaryTag, (DataOutput) new BufferOutputStream(buf)); + BinaryTagIO.writer().write(binaryTag, (DataOutput) new ByteBufOutputStream(this.buf)); } catch (IOException e) { throw new EncoderException("Unable to encode NBT CompoundTag"); } @@ -267,7 +269,7 @@ public int readableBytes() { } public void close() { - this.buf.close(); + this.buf.release(); } public static GsonComponentSerializer getGsonSerializer(final int version) { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/MineConnection.java b/server/src/main/java/de/bauhd/sculk/protocol/MineConnection.java similarity index 75% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/MineConnection.java rename to server/src/main/java/de/bauhd/sculk/protocol/MineConnection.java index 75246684..e2386a3c 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/MineConnection.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/MineConnection.java @@ -1,48 +1,50 @@ -package de.bauhd.minecraft.server.protocol; +package de.bauhd.sculk.protocol; import com.google.gson.reflect.TypeToken; import com.mojang.brigadier.tree.RootCommandNode; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.MinecraftConfig; -import de.bauhd.minecraft.server.command.CommandSource; -import de.bauhd.minecraft.server.connection.Connection; -import de.bauhd.minecraft.server.entity.player.GameProfile; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.entity.player.PlayerInfoEntry; -import de.bauhd.minecraft.server.event.player.PlayerInitialEvent; -import de.bauhd.minecraft.server.event.player.PlayerJoinEvent; -import de.bauhd.minecraft.server.protocol.netty.codec.*; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; -import de.bauhd.minecraft.server.protocol.packet.handler.HandshakePacketHandler; -import de.bauhd.minecraft.server.protocol.packet.handler.LoginPacketHandler; -import de.bauhd.minecraft.server.protocol.packet.handler.PlayPacketHandler; -import de.bauhd.minecraft.server.protocol.packet.handler.StatusPacketHandler; -import de.bauhd.minecraft.server.protocol.packet.login.CompressionPacket; -import de.bauhd.minecraft.server.protocol.packet.login.LoginSuccess; -import de.bauhd.minecraft.server.protocol.packet.play.*; -import de.bauhd.minecraft.server.protocol.packet.play.command.Commands; -import de.bauhd.minecraft.server.util.MojangUtil; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.chunk.MinecraftChunk; -import io.netty5.buffer.Buffer; -import io.netty5.channel.Channel; -import io.netty5.channel.ChannelFutureListeners; -import io.netty5.channel.ChannelHandlerAdapter; -import io.netty5.channel.ChannelHandlerContext; -import io.netty5.util.ReferenceCountUtil; +import com.velocitypowered.natives.util.Natives; +import de.bauhd.sculk.MinecraftConfig; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.sculk.connection.Connection; +import de.bauhd.sculk.entity.player.GameProfile; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.entity.player.PlayerInfoEntry; +import de.bauhd.sculk.event.player.PlayerInitialEvent; +import de.bauhd.sculk.event.player.PlayerJoinEvent; +import de.bauhd.sculk.protocol.netty.codec.*; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.packet.handler.HandshakePacketHandler; +import de.bauhd.sculk.protocol.packet.handler.LoginPacketHandler; +import de.bauhd.sculk.protocol.packet.handler.PlayPacketHandler; +import de.bauhd.sculk.protocol.packet.handler.StatusPacketHandler; +import de.bauhd.sculk.protocol.packet.login.CompressionPacket; +import de.bauhd.sculk.protocol.packet.login.LoginSuccess; +import de.bauhd.sculk.protocol.packet.play.*; +import de.bauhd.sculk.protocol.packet.play.command.Commands; +import de.bauhd.sculk.util.CoordinateUtil; +import de.bauhd.sculk.util.MojangUtil; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.chunk.MinecraftChunk; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.util.ReferenceCountUtil; import net.kyori.adventure.permission.PermissionChecker; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.util.TriState; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; -import javax.crypto.Cipher; import javax.crypto.spec.SecretKeySpec; import java.net.SocketAddress; import java.nio.charset.StandardCharsets; +import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -50,11 +52,10 @@ import java.util.concurrent.TimeoutException; import java.util.function.BiConsumer; -import static de.bauhd.minecraft.server.entity.player.GameProfile.Property; -import static de.bauhd.minecraft.server.util.Constant.*; -import static de.bauhd.minecraft.server.util.CoordinateUtil.chunkCoordinate; +import static de.bauhd.sculk.entity.player.GameProfile.Property; +import static de.bauhd.sculk.util.Constant.*; -public final class MineConnection extends ChannelHandlerAdapter implements Connection { +public final class MineConnection extends ChannelInboundHandlerAdapter implements Connection { private static final Logger LOGGER = LogManager.getLogger(MineConnection.class); @@ -63,7 +64,7 @@ public final class MineConnection extends ChannelHandlerAdapter implements Conne public static CompressionPacket COMPRESSION_PACKET; - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final Channel channel; private State state; private PacketHandler packetHandler; @@ -72,14 +73,14 @@ public final class MineConnection extends ChannelHandlerAdapter implements Conne private String username; private MinecraftPlayer player; - public MineConnection(final AdvancedMinecraftServer server, final Channel channel) { + public MineConnection(final SculkMinecraftServer server, final Channel channel) { this.server = server; this.channel = channel; this.setState(State.HANDSHAKE); } @Override - public void channelRead(ChannelHandlerContext ctx, Object message) { + public void channelRead(@NotNull ChannelHandlerContext ctx, @NotNull Object message) { if (!ctx.channel().isActive()) { return; } @@ -93,16 +94,12 @@ public void channelRead(ChannelHandlerContext ctx, Object message) { } } } finally { - if (message instanceof Buffer buf) { - buf.close(); - } else { - ReferenceCountUtil.release(message); - } + ReferenceCountUtil.release(message); } } @Override - public void channelInactive(ChannelHandlerContext ctx) { + public void channelInactive(@NotNull ChannelHandlerContext ctx) { if (this.player != null) { this.server.removePlayer(this.player.getUniqueId()); this.server.getBossBarListener().onDisconnect(this.player); @@ -110,7 +107,7 @@ public void channelInactive(ChannelHandlerContext ctx) { final var world = this.player.getWorld(); final var position = this.player.getPosition(); if (world != null) { - this.forChunksInRange(chunkCoordinate((int) position.x()), chunkCoordinate((int) position.z()), + this.forChunksInRange(CoordinateUtil.chunkCoordinate((int) position.x()), CoordinateUtil.chunkCoordinate((int) position.z()), this.player.getSettings().getViewDistance(), (x, z) -> { final var chunk = world.getChunk(x, z); chunk.viewers().remove(this.player); @@ -132,7 +129,7 @@ public void channelInactive(ChannelHandlerContext ctx) { } @Override - public void channelExceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { if (!ctx.channel().isActive()) { return; } @@ -140,7 +137,7 @@ public void channelExceptionCaught(ChannelHandlerContext ctx, Throwable cause) t if (cause instanceof TimeoutException) { LOGGER.error(this.username + " timed out"); } else { - super.channelExceptionCaught(ctx, cause); + super.exceptionCaught(ctx, cause); } } @@ -149,7 +146,7 @@ public void play(GameProfile profile) { if (this.server.getConfig().mode() == MinecraftConfig.Mode.BUNGEECORD) { final var arguments = this.serverAddress.split("\00"); this.serverAddress = arguments[0]; - final var properties = (Property[]) AdvancedMinecraftServer.GSON.fromJson(arguments[3], TypeToken.getArray(Property.class).getType()); + final var properties = (Property[]) SculkMinecraftServer.GSON.fromJson(arguments[3], TypeToken.getArray(Property.class).getType()); profile = new GameProfile(MojangUtil.fromMojang(arguments[2]), this.username, List.of(properties)); } else { profile = new GameProfile( @@ -204,7 +201,7 @@ public void play(GameProfile profile) { this.send(new SynchronizePlayerPosition(position)); this.server.getEventHandler().justCall(new PlayerJoinEvent(this.player)); - }, this.channel.executor()).exceptionally(throwable -> { + }, this.executor()).exceptionally(throwable -> { LOGGER.error("Exception during login of player {}", this.player.getUsername(), throwable); return null; }); @@ -225,11 +222,11 @@ public void send(final Packet packet) { } public void sendAndClose(final Packet packet) { - this.channel.writeAndFlush(packet).addListener(this.channel, ChannelFutureListeners.CLOSE); + this.channel.writeAndFlush(packet).addListener(ChannelFutureListener.CLOSE); } public Executor executor() { - return this.channel.executor(); + return this.channel.eventLoop(); } public void setState(final State state) { @@ -246,17 +243,23 @@ public void setState(final State state) { public void enableEncryption(final byte[] secret) { final var secretKey = new SecretKeySpec(secret, "AES"); - - this.channel.pipeline() - .addBefore(FRAME_DECODER, CIPHER_DECODER, new CipherDecoder(new JavaCipher(secretKey, Cipher.DECRYPT_MODE))) - .addBefore(FRAME_ENCODER, CIPHER_ENCODER, new CipherEncoder(new JavaCipher(secretKey, Cipher.ENCRYPT_MODE))); + try { + final var cipherFactory = Natives.cipher.get(); + this.channel.pipeline() + .addBefore(FRAME_DECODER, CIPHER_DECODER, new CipherDecoder(cipherFactory.forDecryption(secretKey))) + .addBefore(FRAME_ENCODER, CIPHER_ENCODER, new CipherEncoder(cipherFactory.forEncryption(secretKey))); + } catch (GeneralSecurityException e) { + throw new RuntimeException(e); + } } private void addCompressionHandler() { + final var compressor = Natives.compress.get().create(this.server.getConfig().compressionLevel()); + this.channel.pipeline().remove(FRAME_ENCODER); this.channel.pipeline() - .addBefore(MINECRAFT_DECODER, COMPRESSOR_DECODER, new CompressorDecoder()) - .addBefore(MINECRAFT_ENCODER, COMPRESSOR_ENCODER, new CompressorEncoder(this.server.getConfig())); + .addBefore(MINECRAFT_DECODER, COMPRESSOR_DECODER, new CompressorDecoder(compressor)) + .addBefore(MINECRAFT_ENCODER, COMPRESSOR_ENCODER, new CompressorEncoder(compressor, this.server.getConfig())); } public void setVersion(final int version) { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/Protocol.java b/server/src/main/java/de/bauhd/sculk/protocol/Protocol.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/Protocol.java rename to server/src/main/java/de/bauhd/sculk/protocol/Protocol.java index 500d78a6..c079a37a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/Protocol.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/Protocol.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.protocol; +package de.bauhd.sculk.protocol; public final class Protocol { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/State.java b/server/src/main/java/de/bauhd/sculk/protocol/State.java similarity index 88% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/State.java rename to server/src/main/java/de/bauhd/sculk/protocol/State.java index 7a0348d3..1f56ee2f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/State.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/State.java @@ -1,29 +1,29 @@ -package de.bauhd.minecraft.server.protocol; +package de.bauhd.sculk.protocol; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.handshake.Handshake; -import de.bauhd.minecraft.server.protocol.packet.login.*; -import de.bauhd.minecraft.server.protocol.packet.play.*; -import de.bauhd.minecraft.server.protocol.packet.play.block.BlockAction; -import de.bauhd.minecraft.server.protocol.packet.play.block.BlockEntityData; -import de.bauhd.minecraft.server.protocol.packet.play.block.BlockUpdate; -import de.bauhd.minecraft.server.protocol.packet.play.command.ChatCommand; -import de.bauhd.minecraft.server.protocol.packet.play.command.CommandSuggestionsResponse; -import de.bauhd.minecraft.server.protocol.packet.play.command.Commands; -import de.bauhd.minecraft.server.protocol.packet.play.container.*; -import de.bauhd.minecraft.server.protocol.packet.play.position.*; -import de.bauhd.minecraft.server.protocol.packet.play.scoreboard.DisplayObjective; -import de.bauhd.minecraft.server.protocol.packet.play.scoreboard.UpdateObjectives; -import de.bauhd.minecraft.server.protocol.packet.play.scoreboard.UpdateScore; -import de.bauhd.minecraft.server.protocol.packet.play.title.ClearTitles; -import de.bauhd.minecraft.server.protocol.packet.play.title.Subtitle; -import de.bauhd.minecraft.server.protocol.packet.play.title.Title; -import de.bauhd.minecraft.server.protocol.packet.play.title.TitleAnimationTimes; -import de.bauhd.minecraft.server.protocol.packet.status.StatusPing; -import de.bauhd.minecraft.server.protocol.packet.status.StatusRequest; -import de.bauhd.minecraft.server.protocol.packet.status.StatusResponse; -import io.netty5.util.collection.IntObjectHashMap; -import io.netty5.util.collection.IntObjectMap; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.handshake.Handshake; +import de.bauhd.sculk.protocol.packet.login.*; +import de.bauhd.sculk.protocol.packet.play.*; +import de.bauhd.sculk.protocol.packet.play.block.BlockAction; +import de.bauhd.sculk.protocol.packet.play.block.BlockEntityData; +import de.bauhd.sculk.protocol.packet.play.block.BlockUpdate; +import de.bauhd.sculk.protocol.packet.play.command.ChatCommand; +import de.bauhd.sculk.protocol.packet.play.command.CommandSuggestionsResponse; +import de.bauhd.sculk.protocol.packet.play.command.Commands; +import de.bauhd.sculk.protocol.packet.play.container.*; +import de.bauhd.sculk.protocol.packet.play.position.*; +import de.bauhd.sculk.protocol.packet.play.scoreboard.DisplayObjective; +import de.bauhd.sculk.protocol.packet.play.scoreboard.UpdateObjectives; +import de.bauhd.sculk.protocol.packet.play.scoreboard.UpdateScore; +import de.bauhd.sculk.protocol.packet.play.title.ClearTitles; +import de.bauhd.sculk.protocol.packet.play.title.Subtitle; +import de.bauhd.sculk.protocol.packet.play.title.Title; +import de.bauhd.sculk.protocol.packet.play.title.TitleAnimationTimes; +import de.bauhd.sculk.protocol.packet.status.StatusPing; +import de.bauhd.sculk.protocol.packet.status.StatusRequest; +import de.bauhd.sculk.protocol.packet.status.StatusResponse; +import io.netty.util.collection.IntObjectHashMap; +import io.netty.util.collection.IntObjectMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/NettyServer.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/NettyServer.java similarity index 51% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/netty/NettyServer.java rename to server/src/main/java/de/bauhd/sculk/protocol/netty/NettyServer.java index a3a8f6d4..5cae4113 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/netty/NettyServer.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/NettyServer.java @@ -1,14 +1,16 @@ -package de.bauhd.minecraft.server.protocol.netty; - -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import io.netty5.bootstrap.ServerBootstrap; -import io.netty5.channel.*; -import io.netty5.channel.epoll.Epoll; -import io.netty5.channel.epoll.EpollHandler; -import io.netty5.channel.epoll.EpollServerSocketChannel; -import io.netty5.channel.nio.NioHandler; -import io.netty5.channel.socket.nio.NioServerSocketChannel; -import io.netty5.util.concurrent.Future; +package de.bauhd.sculk.protocol.netty; + +import de.bauhd.sculk.SculkMinecraftServer; +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.epoll.Epoll; +import io.netty.channel.epoll.EpollEventLoopGroup; +import io.netty.channel.epoll.EpollServerSocketChannel; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import io.netty.util.concurrent.Future; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -16,20 +18,19 @@ public final class NettyServer { private static final Logger LOGGER = LogManager.getLogger(NettyServer.class); - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; - private Future channelFuture; + private Future channelFuture; private EventLoopGroup bossLoopGroup; private EventLoopGroup workerLoopGroup; - public NettyServer(final AdvancedMinecraftServer server) { + public NettyServer(final SculkMinecraftServer server) { this.server = server; } public void connect(final String host, final int port) { - final var factory = Epoll.isAvailable() ? EpollHandler.newFactory() : NioHandler.newFactory(); - this.bossLoopGroup = new MultithreadEventLoopGroup(factory); - this.workerLoopGroup = new MultithreadEventLoopGroup(factory); + this.bossLoopGroup = Epoll.isAvailable() ? new EpollEventLoopGroup() : new NioEventLoopGroup(); + this.workerLoopGroup = Epoll.isAvailable() ? new EpollEventLoopGroup() : new NioEventLoopGroup(); new ServerBootstrap() .channelFactory(Epoll.isAvailable() ? EpollServerSocketChannel::new : NioServerSocketChannel::new) @@ -38,22 +39,20 @@ public void connect(final String host, final int port) { .childOption(ChannelOption.TCP_NODELAY, true) .childOption(ChannelOption.IP_TOS, 24) .bind(host, port) + .addListener(ChannelFutureListener.CLOSE_ON_FAILURE) + .addListener(ChannelFutureListener.FIRE_EXCEPTION_ON_FAILURE) .addListener(future -> { if (future.isSuccess()) { LOGGER.info("Listening on " + host + ":" + port); } else { throw new RuntimeException(future.cause()); } - - final var channel = future.getNow(); - this.channelFuture = channel.closeFuture() - .addListener(channel, ChannelFutureListeners.CLOSE_ON_FAILURE) - .addListener(channel, ChannelFutureListeners.FIRE_EXCEPTION_ON_FAILURE); + this.channelFuture = future; }); } public void close() { - this.channelFuture.cancel(); + this.channelFuture.cancel(true); this.bossLoopGroup.shutdownGracefully(); this.workerLoopGroup.shutdownGracefully(); } diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/NettyServerInitializer.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/NettyServerInitializer.java new file mode 100644 index 00000000..27647516 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/NettyServerInitializer.java @@ -0,0 +1,35 @@ +package de.bauhd.sculk.protocol.netty; + +import com.velocitypowered.natives.encryption.JavaVelocityCipher; +import com.velocitypowered.natives.util.Natives; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.protocol.MineConnection; +import de.bauhd.sculk.protocol.Protocol; +import de.bauhd.sculk.protocol.netty.codec.MinecraftDecoder; +import de.bauhd.sculk.protocol.netty.codec.MinecraftEncoder; +import de.bauhd.sculk.protocol.netty.codec.VarIntFrameDecoder; +import de.bauhd.sculk.protocol.netty.codec.VarIntLengthEncoder; +import de.bauhd.sculk.util.Constant; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; + +public final class NettyServerInitializer extends ChannelInitializer { + + public static final boolean IS_JAVA_CIPHER = Natives.cipher.get() == JavaVelocityCipher.FACTORY; + + private final SculkMinecraftServer server; + + public NettyServerInitializer(final SculkMinecraftServer server) { + this.server = server; + } + + @Override + protected void initChannel(Channel channel) { + channel.pipeline() + .addLast(Constant.FRAME_DECODER, new VarIntFrameDecoder()) + .addLast(Constant.FRAME_ENCODER, VarIntLengthEncoder.INSTANCE) + .addLast(Constant.MINECRAFT_DECODER, new MinecraftDecoder(Protocol.Direction.SERVERBOUND)) + .addLast(Constant.MINECRAFT_ENCODER, new MinecraftEncoder(Protocol.Direction.CLIENTBOUND)) + .addLast(Constant.HANDLER, new MineConnection(this.server, channel)); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherDecoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherDecoder.java new file mode 100644 index 00000000..4c7782d7 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherDecoder.java @@ -0,0 +1,35 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import com.velocitypowered.natives.encryption.VelocityCipher; +import com.velocitypowered.natives.util.MoreByteBufUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; + +import java.util.List; + +public final class CipherDecoder extends MessageToMessageDecoder { + + private final VelocityCipher cipher; + + public CipherDecoder(final VelocityCipher cipher) { + this.cipher = cipher; + } + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List out) { + final var compatible = MoreByteBufUtils.ensureCompatible(ctx.alloc(), this.cipher, buf).slice(); + try { + this.cipher.process(compatible); + out.add(compatible); + } catch (Exception e) { + compatible.release(); + throw e; + } + } + + @Override + public void handlerRemoved(ChannelHandlerContext ctx) { + this.cipher.close(); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherEncoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherEncoder.java new file mode 100644 index 00000000..43f8f206 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CipherEncoder.java @@ -0,0 +1,35 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import com.velocitypowered.natives.encryption.VelocityCipher; +import com.velocitypowered.natives.util.MoreByteBufUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageEncoder; + +import java.util.List; + +public final class CipherEncoder extends MessageToMessageEncoder { + + private final VelocityCipher cipher; + + public CipherEncoder(final VelocityCipher cipher) { + this.cipher = cipher; + } + + @Override + protected void encode(ChannelHandlerContext ctx, ByteBuf msg, List out) { + final var compatible = MoreByteBufUtils.ensureCompatible(ctx.alloc(), this.cipher, msg); + try { + this.cipher.process(compatible); + out.add(compatible); + } catch (Exception e) { + compatible.release(); + throw e; + } + } + + @Override + public void handlerRemoved(ChannelHandlerContext ctx) { + this.cipher.close(); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorDecoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorDecoder.java new file mode 100644 index 00000000..a5b7917e --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorDecoder.java @@ -0,0 +1,45 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import com.velocitypowered.natives.compression.VelocityCompressor; +import com.velocitypowered.natives.util.MoreByteBufUtils; +import de.bauhd.sculk.protocol.packet.PacketUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; + +import java.util.List; + +public final class CompressorDecoder extends MessageToMessageDecoder { + + private final VelocityCompressor compressor; + + public CompressorDecoder(final VelocityCompressor compressor) { + this.compressor = compressor; + } + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List out) throws Exception { + final int size = PacketUtils.readVarInt(buf); + if (size == 0) { + out.add(buf.retain()); + return; + } + + final var compatible = MoreByteBufUtils.ensureCompatible(ctx.alloc(), this.compressor, buf); + final var uncompressed = MoreByteBufUtils.preferredBuffer(ctx.alloc(), this.compressor, size); + try { + this.compressor.inflate(compatible, uncompressed, size); + out.add(uncompressed); + } catch (Exception e) { + uncompressed.release(); + throw e; + } finally { + compatible.release(); + } + } + + @Override + public void handlerRemoved(ChannelHandlerContext ctx) { + this.compressor.close(); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorEncoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorEncoder.java new file mode 100644 index 00000000..f568fa6e --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/CompressorEncoder.java @@ -0,0 +1,62 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import com.velocitypowered.natives.compression.VelocityCompressor; +import com.velocitypowered.natives.util.MoreByteBufUtils; +import de.bauhd.sculk.MinecraftConfig; +import de.bauhd.sculk.protocol.netty.NettyServerInitializer; +import de.bauhd.sculk.protocol.packet.PacketUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToByteEncoder; + +public final class CompressorEncoder extends MessageToByteEncoder { + + private final VelocityCompressor compressor; + private final int threshold; + + public CompressorEncoder(final VelocityCompressor compressor, final MinecraftConfig config) { + this.compressor = compressor; + this.threshold = config.compressionThreshold(); + } + + @Override + protected void encode(ChannelHandlerContext ctx, ByteBuf buf, ByteBuf out) throws Exception { + final var size = buf.readableBytes(); + if (size < this.threshold) { // under threshold - so nothing to do + PacketUtils.writeVarInt(out, size + 1); + PacketUtils.writeVarInt(out, 0); + out.writeBytes(buf); + } else { + out.writeMedium(8421376); + PacketUtils.writeVarInt(out, size); + final var compatible = MoreByteBufUtils.ensureCompatible(ctx.alloc(), this.compressor, buf); + try { + this.compressor.deflate(compatible, out); + } finally { + compatible.release(); + } + final var length = out.readableBytes() - 3; + final var offset = out.writerIndex(); + out.writerIndex(0); + out.writeMedium((length & 0x7F | 0x80) << 16 | ((length >>> 7) & 0x7F | 0x80) << 8 | (length >>> 14)); + out.writerIndex(offset); + } + } + + @Override + protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf buf, boolean preferDirect) { + var size = buf.readableBytes(); + if (size < this.threshold) { + size += 1 + PacketUtils.varIntLength(size + 1); + return NettyServerInitializer.IS_JAVA_CIPHER ? ctx.alloc().heapBuffer(size) : ctx.alloc().directBuffer(size); + } else { + size += 2 + PacketUtils.varIntLength(size); + return MoreByteBufUtils.preferredBuffer(ctx.alloc(), this.compressor, size); + } + } + + @Override + public void handlerRemoved(ChannelHandlerContext ctx) { + this.compressor.close(); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftDecoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftDecoder.java new file mode 100644 index 00000000..aba6e58c --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftDecoder.java @@ -0,0 +1,74 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import de.bauhd.sculk.protocol.Protocol; +import de.bauhd.sculk.protocol.State; +import de.bauhd.sculk.protocol.packet.PacketUtils; +import de.bauhd.sculk.protocol.Buffer; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.handler.codec.DecoderException; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.jetbrains.annotations.NotNull; + +public final class MinecraftDecoder extends ChannelInboundHandlerAdapter { + + private static final Logger LOGGER = LogManager.getLogger(MinecraftDecoder.class); + + private final Protocol.Direction direction; + private State.PacketRegistry registry; + + public MinecraftDecoder(Protocol.Direction direction) { + this.direction = direction; + } + + @Override + public void channelRead(@NotNull ChannelHandlerContext ctx, @NotNull Object message) { + if (message instanceof ByteBuf buf) { + if (!ctx.channel().isActive() || buf.readableBytes() <= 0) { + buf.release(); + return; + } + + final var offset = buf.readerIndex(); + final var id = PacketUtils.readVarInt(buf); + final var packet = this.registry.createPacket(id); + if (packet == null) { + buf.readerIndex(offset); + ctx.fireChannelRead(message); + LOGGER.warn("Unknown packet id 0x" + Integer.toHexString(id)); + } else { + final var minLength = packet.minLength(); + final var maxLength = packet.maxLength(); + final var length = buf.readableBytes(); + if (maxLength != -1 && length > maxLength) { + throw new DecoderException("Overflow packet " + packet.getClass().getSimpleName() + + " (max length = " + maxLength + ", length = " + length + ")"); + } + if (length < minLength) { + throw new DecoderException("Underflow packet " + packet.getClass().getSimpleName() + + " (min length = " + minLength + ", length = " + length + ")"); + } + + try { + packet.decode(new Buffer(buf)); + } catch (Exception e) { + LOGGER.error("Error during decoding of " + packet.getClass(), e); + } + if (buf.readableBytes() > 0) { + throw new DecoderException("Overflow after decode packet " + + packet.getClass().getSimpleName() + " (length = " + buf.readableBytes() + ")"); + } + //System.out.println("decoded " + packet + " - " + id); + ctx.fireChannelRead(packet); + } + } else { + ctx.fireChannelRead(message); + } + } + + public void setState(final State state) { + this.registry = this.direction.getRegistry(state); + } +} \ No newline at end of file diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftEncoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftEncoder.java new file mode 100644 index 00000000..9b08b41a --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/MinecraftEncoder.java @@ -0,0 +1,35 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import de.bauhd.sculk.protocol.Protocol; +import de.bauhd.sculk.protocol.State; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketUtils; +import de.bauhd.sculk.protocol.Buffer; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToByteEncoder; + +public final class MinecraftEncoder extends MessageToByteEncoder { + + private final Protocol.Direction direction; + private State.PacketRegistry registry; + + public MinecraftEncoder(final Protocol.Direction direction) { + this.direction = direction; + } + + @Override + protected void encode(ChannelHandlerContext ctx, Packet packet, ByteBuf buf) { + PacketUtils.writeVarInt(buf, this.registry.getPacketId(packet)); + packet.encode(new Buffer(buf)); + } + + @Override + protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, Packet packet, boolean preferDirect) { + return ctx.alloc().directBuffer(PacketUtils.varIntLength(this.registry.getPacketId(packet)) + packet.minLength()); + } + + public void setState(final State state) { + this.registry = this.direction.getRegistry(state); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntFrameDecoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntFrameDecoder.java new file mode 100644 index 00000000..64b88021 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntFrameDecoder.java @@ -0,0 +1,41 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import de.bauhd.sculk.protocol.packet.PacketUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.ByteToMessageDecoder; + +import java.util.List; + +public final class VarIntFrameDecoder extends ByteToMessageDecoder { + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List out) { + if (!ctx.channel().isActive()) { + buf.release(); + return; + } + + final var readerIndex = buf.readerIndex(); + final var length = PacketUtils.readVarInt(buf); + + if (readerIndex == buf.readerIndex()) { + buf.readerIndex(readerIndex); + return; + } + + if (length <= 0) { + if (buf.readableBytes() > 0) { + buf.skipBytes(buf.readableBytes()); + } + return; + } + + if (buf.readableBytes() >= length) { + out.add(buf.retainedSlice(buf.readerIndex(), length)); + buf.skipBytes(length); + } else { + buf.readerIndex(readerIndex); + } + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntLengthEncoder.java b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntLengthEncoder.java new file mode 100644 index 00000000..f7a80aae --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/netty/codec/VarIntLengthEncoder.java @@ -0,0 +1,29 @@ +package de.bauhd.sculk.protocol.netty.codec; + +import de.bauhd.sculk.protocol.netty.NettyServerInitializer; +import de.bauhd.sculk.protocol.packet.PacketUtils; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToByteEncoder; + +public final class VarIntLengthEncoder extends MessageToByteEncoder { + + public static final VarIntLengthEncoder INSTANCE = new VarIntLengthEncoder(); + + @Override + protected void encode(ChannelHandlerContext ctx, ByteBuf msg, ByteBuf out) { + PacketUtils.writeVarInt(out, msg.readableBytes()); + out.writeBytes(msg); + } + + @Override + protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf buf, boolean preferDirect) { + final var size = PacketUtils.varIntLength(buf.readableBytes()) + buf.readableBytes(); + return NettyServerInitializer.IS_JAVA_CIPHER ? ctx.alloc().heapBuffer(size) : ctx.alloc().directBuffer(size); + } + + @Override + public boolean isSharable() { + return true; + } +} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/Packet.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/Packet.java similarity index 76% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/Packet.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/Packet.java index e181bf3a..dfced742 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/Packet.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/Packet.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.protocol.packet; +package de.bauhd.sculk.protocol.packet; -import de.bauhd.minecraft.server.protocol.Buffer; +import de.bauhd.sculk.protocol.Buffer; public interface Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/PacketHandler.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/PacketHandler.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/PacketHandler.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/PacketHandler.java index a054e00a..ddc01189 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/PacketHandler.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/PacketHandler.java @@ -1,20 +1,20 @@ -package de.bauhd.minecraft.server.protocol.packet; - -import de.bauhd.minecraft.server.protocol.packet.handshake.Handshake; -import de.bauhd.minecraft.server.protocol.packet.login.EncryptionResponse; -import de.bauhd.minecraft.server.protocol.packet.login.LoginPluginResponse; -import de.bauhd.minecraft.server.protocol.packet.login.LoginStart; -import de.bauhd.minecraft.server.protocol.packet.play.*; -import de.bauhd.minecraft.server.protocol.packet.play.command.ChatCommand; -import de.bauhd.minecraft.server.protocol.packet.play.container.ClickContainer; -import de.bauhd.minecraft.server.protocol.packet.play.container.ClickContainerButton; -import de.bauhd.minecraft.server.protocol.packet.play.container.CloseContainer; -import de.bauhd.minecraft.server.protocol.packet.play.position.PlayerOnGround; -import de.bauhd.minecraft.server.protocol.packet.play.position.PlayerPosition; -import de.bauhd.minecraft.server.protocol.packet.play.position.PlayerPositionAndRotation; -import de.bauhd.minecraft.server.protocol.packet.play.position.PlayerRotation; -import de.bauhd.minecraft.server.protocol.packet.status.StatusPing; -import de.bauhd.minecraft.server.protocol.packet.status.StatusRequest; +package de.bauhd.sculk.protocol.packet; + +import de.bauhd.sculk.protocol.packet.handshake.Handshake; +import de.bauhd.sculk.protocol.packet.login.EncryptionResponse; +import de.bauhd.sculk.protocol.packet.login.LoginPluginResponse; +import de.bauhd.sculk.protocol.packet.login.LoginStart; +import de.bauhd.sculk.protocol.packet.play.*; +import de.bauhd.sculk.protocol.packet.play.command.ChatCommand; +import de.bauhd.sculk.protocol.packet.play.container.ClickContainer; +import de.bauhd.sculk.protocol.packet.play.container.ClickContainerButton; +import de.bauhd.sculk.protocol.packet.play.container.CloseContainer; +import de.bauhd.sculk.protocol.packet.play.position.PlayerOnGround; +import de.bauhd.sculk.protocol.packet.play.position.PlayerPosition; +import de.bauhd.sculk.protocol.packet.play.position.PlayerPositionAndRotation; +import de.bauhd.sculk.protocol.packet.play.position.PlayerRotation; +import de.bauhd.sculk.protocol.packet.status.StatusPing; +import de.bauhd.sculk.protocol.packet.status.StatusRequest; public abstract class PacketHandler { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/PacketUtils.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/PacketUtils.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/PacketUtils.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/PacketUtils.java index 6b40c4a9..461a5d9d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/PacketUtils.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/PacketUtils.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.protocol.packet; +package de.bauhd.sculk.protocol.packet; -import io.netty5.buffer.Buffer; +import io.netty.buffer.ByteBuf; public final class PacketUtils { @@ -12,7 +12,7 @@ public static int varIntLength(final int value) { } // https://steinborn.me/posts/performance/how-fast-can-you-write-a-varint/ - public static void writeVarInt(final Buffer buf, int value) { + public static void writeVarInt(final ByteBuf buf, int value) { if ((value & (0xFFFFFFFF << 7)) == 0) { buf.writeByte((byte) value); } else if ((value & (0xFFFFFFFF << 14)) == 0) { @@ -28,7 +28,7 @@ public static void writeVarInt(final Buffer buf, int value) { buf.writeByte((byte) (value >>> 28)); }} - public static int readVarInt(final Buffer buf) { + public static int readVarInt(final ByteBuf buf) { var value = 0; var position = 0; @@ -45,5 +45,4 @@ public static int readVarInt(final Buffer buf) { } return value; } - } diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/HandshakePacketHandler.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/HandshakePacketHandler.java similarity index 68% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/HandshakePacketHandler.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/handler/HandshakePacketHandler.java index e7b77763..501ddc4c 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/HandshakePacketHandler.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/HandshakePacketHandler.java @@ -1,11 +1,11 @@ -package de.bauhd.minecraft.server.protocol.packet.handler; +package de.bauhd.sculk.protocol.packet.handler; -import de.bauhd.minecraft.server.protocol.MineConnection; -import de.bauhd.minecraft.server.protocol.Protocol; -import de.bauhd.minecraft.server.protocol.State; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; -import de.bauhd.minecraft.server.protocol.packet.handshake.Handshake; -import de.bauhd.minecraft.server.protocol.packet.login.Disconnect; +import de.bauhd.sculk.protocol.MineConnection; +import de.bauhd.sculk.protocol.Protocol; +import de.bauhd.sculk.protocol.State; +import de.bauhd.sculk.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.packet.handshake.Handshake; +import de.bauhd.sculk.protocol.packet.login.Disconnect; import net.kyori.adventure.text.Component; public final class HandshakePacketHandler extends PacketHandler { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/LoginPacketHandler.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/LoginPacketHandler.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/LoginPacketHandler.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/handler/LoginPacketHandler.java index 768d87bd..f2debed4 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/LoginPacketHandler.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/LoginPacketHandler.java @@ -1,12 +1,12 @@ -package de.bauhd.minecraft.server.protocol.packet.handler; +package de.bauhd.sculk.protocol.packet.handler; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.MinecraftConfig; -import de.bauhd.minecraft.server.protocol.MineConnection; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; -import de.bauhd.minecraft.server.protocol.packet.login.*; -import de.bauhd.minecraft.server.util.EncryptionUtil; -import de.bauhd.minecraft.server.util.MojangUtil; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.MinecraftConfig; +import de.bauhd.sculk.protocol.MineConnection; +import de.bauhd.sculk.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.packet.login.*; +import de.bauhd.sculk.util.EncryptionUtil; +import de.bauhd.sculk.util.MojangUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -21,11 +21,11 @@ public final class LoginPacketHandler extends PacketHandler { private final MineConnection connection; - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private byte[] verifyToken; - public LoginPacketHandler(final MineConnection connection, final AdvancedMinecraftServer server) { + public LoginPacketHandler(final MineConnection connection, final SculkMinecraftServer server) { this.connection = connection; this.server = server; } diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/PlayPacketHandler.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/PlayPacketHandler.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/PlayPacketHandler.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/handler/PlayPacketHandler.java index cadc007d..cadc8ebe 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/PlayPacketHandler.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/PlayPacketHandler.java @@ -1,30 +1,30 @@ -package de.bauhd.minecraft.server.protocol.packet.handler; - -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.container.MineContainer; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.entity.Entity; -import de.bauhd.minecraft.server.entity.player.GameMode; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.event.block.BlockBreakEvent; -import de.bauhd.minecraft.server.event.block.BlockPlaceEvent; -import de.bauhd.minecraft.server.event.player.PlayerChatEvent; -import de.bauhd.minecraft.server.event.player.PlayerClickContainerButtonEvent; -import de.bauhd.minecraft.server.event.player.PlayerClickContainerEvent; -import de.bauhd.minecraft.server.event.player.PlayerUseItemEvent; -import de.bauhd.minecraft.server.protocol.MineConnection; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; -import de.bauhd.minecraft.server.protocol.packet.play.*; -import de.bauhd.minecraft.server.protocol.packet.play.block.BlockUpdate; -import de.bauhd.minecraft.server.protocol.packet.play.command.ChatCommand; -import de.bauhd.minecraft.server.protocol.packet.play.container.ClickContainer; -import de.bauhd.minecraft.server.protocol.packet.play.container.ClickContainerButton; -import de.bauhd.minecraft.server.protocol.packet.play.container.CloseContainer; -import de.bauhd.minecraft.server.protocol.packet.play.container.ContainerContent; -import de.bauhd.minecraft.server.protocol.packet.play.position.*; -import de.bauhd.minecraft.server.util.ItemList; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.block.Block; +package de.bauhd.sculk.protocol.packet.handler; + +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.container.MineContainer; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.entity.Entity; +import de.bauhd.sculk.entity.player.GameMode; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.event.block.BlockBreakEvent; +import de.bauhd.sculk.event.block.BlockPlaceEvent; +import de.bauhd.sculk.event.player.PlayerChatEvent; +import de.bauhd.sculk.event.player.PlayerClickContainerButtonEvent; +import de.bauhd.sculk.event.player.PlayerClickContainerEvent; +import de.bauhd.sculk.event.player.PlayerUseItemEvent; +import de.bauhd.sculk.protocol.MineConnection; +import de.bauhd.sculk.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.packet.play.*; +import de.bauhd.sculk.protocol.packet.play.block.BlockUpdate; +import de.bauhd.sculk.protocol.packet.play.command.ChatCommand; +import de.bauhd.sculk.protocol.packet.play.container.ClickContainer; +import de.bauhd.sculk.protocol.packet.play.container.ClickContainerButton; +import de.bauhd.sculk.protocol.packet.play.container.CloseContainer; +import de.bauhd.sculk.protocol.packet.play.container.ContainerContent; +import de.bauhd.sculk.protocol.packet.play.position.*; +import de.bauhd.sculk.util.ItemList; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.block.Block; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,10 +33,10 @@ public final class PlayPacketHandler extends PacketHandler { private static final Logger LOGGER = LogManager.getLogger(PlayPacketHandler.class); private final MineConnection connection; - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final MinecraftPlayer player; - public PlayPacketHandler(final MineConnection connection, final AdvancedMinecraftServer server, final MinecraftPlayer player) { + public PlayPacketHandler(final MineConnection connection, final SculkMinecraftServer server, final MinecraftPlayer player) { this.connection = connection; this.server = server; this.player = player; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/StatusPacketHandler.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/StatusPacketHandler.java similarity index 70% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/StatusPacketHandler.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/handler/StatusPacketHandler.java index 29c57b6e..e3f98c8f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handler/StatusPacketHandler.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/handler/StatusPacketHandler.java @@ -1,22 +1,22 @@ -package de.bauhd.minecraft.server.protocol.packet.handler; +package de.bauhd.sculk.protocol.packet.handler; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.event.connection.ServerPingEvent; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.MineConnection; -import de.bauhd.minecraft.server.protocol.Protocol; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; -import de.bauhd.minecraft.server.protocol.packet.status.StatusPing; -import de.bauhd.minecraft.server.protocol.packet.status.StatusRequest; -import de.bauhd.minecraft.server.protocol.packet.status.StatusResponse; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.event.connection.ServerPingEvent; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.MineConnection; +import de.bauhd.sculk.protocol.Protocol; +import de.bauhd.sculk.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.packet.status.StatusPing; +import de.bauhd.sculk.protocol.packet.status.StatusRequest; +import de.bauhd.sculk.protocol.packet.status.StatusResponse; import net.kyori.adventure.text.Component; public final class StatusPacketHandler extends PacketHandler { - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final MineConnection connection; - public StatusPacketHandler(final MineConnection connection, final AdvancedMinecraftServer server) { + public StatusPacketHandler(final MineConnection connection, final SculkMinecraftServer server) { this.connection = connection; this.server = server; } diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handshake/Handshake.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/handshake/Handshake.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handshake/Handshake.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/handshake/Handshake.java index ea5099ae..e249e127 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/handshake/Handshake.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/handshake/Handshake.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.protocol.packet.handshake; +package de.bauhd.sculk.protocol.packet.handshake; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.State; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.State; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class Handshake implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/CompressionPacket.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/CompressionPacket.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/CompressionPacket.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/CompressionPacket.java index ff069ce5..cf999d13 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/CompressionPacket.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/CompressionPacket.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class CompressionPacket implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/Disconnect.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/Disconnect.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/Disconnect.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/Disconnect.java index 1452fa61..f110a351 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/Disconnect.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/Disconnect.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class Disconnect implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/EncryptionRequest.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/EncryptionRequest.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/EncryptionRequest.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/EncryptionRequest.java index 19c8759e..700a3a33 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/EncryptionRequest.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/EncryptionRequest.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import java.util.Arrays; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/EncryptionResponse.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/EncryptionResponse.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/EncryptionResponse.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/EncryptionResponse.java index cd3db893..1c4ad289 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/EncryptionResponse.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/EncryptionResponse.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; import java.util.Arrays; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginPluginRequest.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginPluginRequest.java similarity index 77% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginPluginRequest.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginPluginRequest.java index e0e33821..83d29e90 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginPluginRequest.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginPluginRequest.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class LoginPluginRequest implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginPluginResponse.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginPluginResponse.java similarity index 75% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginPluginResponse.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginPluginResponse.java index 94593901..325143d1 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginPluginResponse.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginPluginResponse.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class LoginPluginResponse implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginStart.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginStart.java similarity index 77% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginStart.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginStart.java index 0182fe33..f2885c04 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginStart.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginStart.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; import java.util.UUID; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginSuccess.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginSuccess.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginSuccess.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginSuccess.java index 6be15e49..c43fc2fd 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/login/LoginSuccess.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/login/LoginSuccess.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.login; +package de.bauhd.sculk.protocol.packet.login; -import de.bauhd.minecraft.server.entity.player.GameProfile; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.entity.player.GameProfile; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class LoginSuccess implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ActionBar.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ActionBar.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ActionBar.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/ActionBar.java index 99ebe78d..a2ef10ab 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ActionBar.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ActionBar.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class ActionBar implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/AwardStatistics.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/AwardStatistics.java similarity index 54% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/AwardStatistics.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/AwardStatistics.java index b3f441ce..ef3dc1e3 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/AwardStatistics.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/AwardStatistics.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class AwardStatistics implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/BossBar.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/BossBar.java similarity index 94% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/BossBar.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/BossBar.java index 2c8520f6..04dd8cdb 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/BossBar.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/BossBar.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; import java.util.UUID; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CenterChunk.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/CenterChunk.java similarity index 77% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CenterChunk.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/CenterChunk.java index 4889bed3..4a83599e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CenterChunk.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/CenterChunk.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class CenterChunk implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChangeDifficulty.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChangeDifficulty.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChangeDifficulty.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChangeDifficulty.java index d8d416be..35138a95 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChangeDifficulty.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChangeDifficulty.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class ChangeDifficulty implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChatMessage.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChatMessage.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChatMessage.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChatMessage.java index bf3484f1..e5dd422a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChatMessage.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChatMessage.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; import java.util.Arrays; @@ -23,7 +23,7 @@ public void decode(Buffer buf) { this.signedPreview = buf.readBoolean(); // ignore for now - buf.buf().skipReadableBytes(buf.buf().readableBytes()); + buf.readAll(); } @Override diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChunkDataAndUpdateLight.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChunkDataAndUpdateLight.java similarity index 86% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChunkDataAndUpdateLight.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChunkDataAndUpdateLight.java index 7e8b7191..3fd4161e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ChunkDataAndUpdateLight.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ChunkDataAndUpdateLight.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.world.chunk.LightData; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.world.chunk.LightData; import net.kyori.adventure.nbt.CompoundBinaryTag; public final class ChunkDataAndUpdateLight implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ClientCommand.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ClientCommand.java similarity index 70% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ClientCommand.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/ClientCommand.java index fc6c479e..776da3fa 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ClientCommand.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ClientCommand.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class ClientCommand implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ClientInformation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ClientInformation.java similarity index 90% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ClientInformation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/ClientInformation.java index 861abab1..fda0add9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ClientInformation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ClientInformation.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.entity.player.PlayerSettings; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.entity.player.PlayerSettings; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class ClientInformation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CommandSuggestionsRequest.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/CommandSuggestionsRequest.java similarity index 76% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CommandSuggestionsRequest.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/CommandSuggestionsRequest.java index 04926029..ce8dd355 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CommandSuggestionsRequest.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/CommandSuggestionsRequest.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class CommandSuggestionsRequest implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ConfirmTeleportation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ConfirmTeleportation.java similarity index 68% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ConfirmTeleportation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/ConfirmTeleportation.java index 8cd1f9c9..77dadcf3 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/ConfirmTeleportation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/ConfirmTeleportation.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class ConfirmTeleportation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Cooldown.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Cooldown.java similarity index 79% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Cooldown.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/Cooldown.java index adbd51ac..3062f79a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Cooldown.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Cooldown.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class Cooldown implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CreativeModeSlot.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/CreativeModeSlot.java similarity index 71% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CreativeModeSlot.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/CreativeModeSlot.java index cbe5daf0..80d8dbb2 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/CreativeModeSlot.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/CreativeModeSlot.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class CreativeModeSlot implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EditBook.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EditBook.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EditBook.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/EditBook.java index 0fcc8456..a4d19d9b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EditBook.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EditBook.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class EditBook implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityAnimation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityAnimation.java similarity index 79% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityAnimation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityAnimation.java index 3b9be64e..47e79a80 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityAnimation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityAnimation.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class EntityAnimation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityEvent.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityEvent.java similarity index 79% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityEvent.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityEvent.java index 5f3c6825..984afeb1 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityEvent.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityEvent.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class EntityEvent implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityMetadata.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityMetadata.java similarity index 76% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityMetadata.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityMetadata.java index 0bb25568..2e03839e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/EntityMetadata.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/EntityMetadata.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.entity.Metadata; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.entity.Metadata; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import java.util.Map; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Equipment.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Equipment.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Equipment.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/Equipment.java index e1fd3afe..bf1874a8 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Equipment.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Equipment.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import java.util.Map; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Experience.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Experience.java similarity index 57% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Experience.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/Experience.java index 1451e4d3..a667e259 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Experience.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Experience.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class Experience implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/FeatureFlags.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/FeatureFlags.java similarity index 70% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/FeatureFlags.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/FeatureFlags.java index dfb6f8be..485ffea8 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/FeatureFlags.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/FeatureFlags.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class FeatureFlags implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/GameEvent.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/GameEvent.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/GameEvent.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/GameEvent.java index 32636eeb..9ac1f392 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/GameEvent.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/GameEvent.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class GameEvent implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Health.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Health.java similarity index 57% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Health.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/Health.java index ee73349d..0f043b7e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Health.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Health.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class Health implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/HeldItem.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/HeldItem.java similarity index 76% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/HeldItem.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/HeldItem.java index 20161e14..2a738e76 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/HeldItem.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/HeldItem.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; // yes, decode -> short and encode -> byte, is right public final class HeldItem implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Interact.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Interact.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Interact.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/Interact.java index a8c7bf06..bbd403a4 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Interact.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Interact.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class Interact implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/KeepAlive.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/KeepAlive.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/KeepAlive.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/KeepAlive.java index 3d27f30e..5a9e0fd6 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/KeepAlive.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/KeepAlive.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class KeepAlive implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Login.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Login.java similarity index 86% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Login.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/Login.java index 853ac9fc..dc3f268d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Login.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Login.java @@ -1,11 +1,11 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.damage.DamageType; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.registry.Registry; -import de.bauhd.minecraft.server.world.biome.Biome; -import de.bauhd.minecraft.server.world.dimension.Dimension; +import de.bauhd.sculk.damage.DamageType; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.registry.Registry; +import de.bauhd.sculk.world.biome.Biome; +import de.bauhd.sculk.world.dimension.Dimension; import net.kyori.adventure.nbt.CompoundBinaryTag; public final class Login implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PickupItem.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PickupItem.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PickupItem.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PickupItem.java index 1bbf5945..cea7a4b1 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PickupItem.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PickupItem.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class PickupItem implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerAbilities.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerAbilities.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerAbilities.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerAbilities.java index 7356f1f8..940fb002 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerAbilities.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerAbilities.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class PlayerAbilities implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerAction.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerAction.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerAction.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerAction.java index 04556d71..313cf08c 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerAction.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerAction.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class PlayerAction implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerCommand.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerCommand.java similarity index 85% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerCommand.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerCommand.java index 1cb6e6b8..1edd6444 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerCommand.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerCommand.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class PlayerCommand implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerInfo.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerInfo.java similarity index 93% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerInfo.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerInfo.java index e15d5208..ade28425 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerInfo.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerInfo.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.entity.player.PlayerInfoEntry; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.entity.player.PlayerInfoEntry; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import java.util.Arrays; import java.util.BitSet; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerInfoRemove.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerInfoRemove.java similarity index 73% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerInfoRemove.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerInfoRemove.java index 4b841a1a..85fad709 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerInfoRemove.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerInfoRemove.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.entity.player.PlayerInfoEntry; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.entity.player.PlayerInfoEntry; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import java.util.List; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerSession.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerSession.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerSession.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerSession.java index c21e2af7..374bab68 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PlayerSession.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PlayerSession.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; import java.util.UUID; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PluginMessage.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PluginMessage.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PluginMessage.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/PluginMessage.java index 4abb8029..e6ddaf96 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/PluginMessage.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/PluginMessage.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; import java.util.Arrays; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RecipeBookSettings.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/RecipeBookSettings.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RecipeBookSettings.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/RecipeBookSettings.java index 15af0b0b..4d36fb25 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RecipeBookSettings.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/RecipeBookSettings.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class RecipeBookSettings implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RemoveEntities.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/RemoveEntities.java similarity index 70% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RemoveEntities.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/RemoveEntities.java index b7cd3589..55751adc 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RemoveEntities.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/RemoveEntities.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class RemoveEntities implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RenderDistance.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/RenderDistance.java similarity index 65% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RenderDistance.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/RenderDistance.java index 81e1515f..49994382 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/RenderDistance.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/RenderDistance.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class RenderDistance implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Respawn.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Respawn.java similarity index 86% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Respawn.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/Respawn.java index a968a75b..688fed11 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/Respawn.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/Respawn.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.entity.player.GameMode; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.entity.player.GameMode; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class Respawn implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SimulationDistance.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SimulationDistance.java similarity index 67% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SimulationDistance.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SimulationDistance.java index 706dac1f..c9159af8 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SimulationDistance.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SimulationDistance.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class SimulationDistance implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnEntity.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnEntity.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnEntity.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnEntity.java index f30b2620..a47185be 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnEntity.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnEntity.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import java.util.UUID; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnExperienceOrb.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnExperienceOrb.java similarity index 81% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnExperienceOrb.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnExperienceOrb.java index c44932fc..b8509b41 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnExperienceOrb.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnExperienceOrb.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class SpawnExperienceOrb implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnPlayer.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnPlayer.java similarity index 77% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnPlayer.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnPlayer.java index e857ca76..6d9aae61 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnPlayer.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnPlayer.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class SpawnPlayer implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnPosition.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnPosition.java similarity index 62% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnPosition.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnPosition.java index 9b990496..30787d44 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SpawnPosition.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SpawnPosition.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class SpawnPosition implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SwingArm.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SwingArm.java similarity index 72% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SwingArm.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SwingArm.java index ea1d6985..7c2473e2 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SwingArm.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SwingArm.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class SwingArm implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SynchronizePlayerPosition.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SynchronizePlayerPosition.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SynchronizePlayerPosition.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SynchronizePlayerPosition.java index c771401f..023fd930 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SynchronizePlayerPosition.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SynchronizePlayerPosition.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class SynchronizePlayerPosition implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SystemChatMessage.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SystemChatMessage.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SystemChatMessage.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/SystemChatMessage.java index e9207974..1a431502 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/SystemChatMessage.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/SystemChatMessage.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class SystemChatMessage implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/TabListHeaderFooter.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/TabListHeaderFooter.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/TabListHeaderFooter.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/TabListHeaderFooter.java index e1ffeb7a..0b29fa85 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/TabListHeaderFooter.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/TabListHeaderFooter.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class TabListHeaderFooter implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/TeleportToEntity.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/TeleportToEntity.java similarity index 72% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/TeleportToEntity.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/TeleportToEntity.java index 61f86537..1a5426e0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/TeleportToEntity.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/TeleportToEntity.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import java.util.UUID; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateAttributes.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateAttributes.java similarity index 67% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateAttributes.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateAttributes.java index cc38fe21..3f4074d9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UpdateAttributes.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateAttributes.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class UpdateAttributes implements Packet { diff --git a/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateRecipes.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateRecipes.java new file mode 100644 index 00000000..3b693425 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateRecipes.java @@ -0,0 +1,12 @@ +package de.bauhd.sculk.protocol.packet.play; + +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; + +public final class UpdateRecipes implements Packet { + + @Override + public void encode(Buffer buf) { + buf.writeVarInt(0); + } +} diff --git a/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateTags.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateTags.java new file mode 100644 index 00000000..2b8f86e6 --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UpdateTags.java @@ -0,0 +1,12 @@ +package de.bauhd.sculk.protocol.packet.play; + +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; + +public final class UpdateTags implements Packet { + + @Override + public void encode(Buffer buf) { + buf.writeVarInt(0); + } +} diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UseItem.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UseItem.java similarity index 74% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UseItem.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/UseItem.java index e00e4d58..09630184 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UseItem.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UseItem.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class UseItem implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UseItemOn.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UseItemOn.java similarity index 83% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UseItemOn.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/UseItemOn.java index 55b6bae9..1f8ab98b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/UseItemOn.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/UseItemOn.java @@ -1,10 +1,10 @@ -package de.bauhd.minecraft.server.protocol.packet.play; +package de.bauhd.sculk.protocol.packet.play; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.block.Block; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.block.Block; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class UseItemOn implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockAction.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockAction.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockAction.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockAction.java index 33110e4b..f8b8aa6d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockAction.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockAction.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.block; +package de.bauhd.sculk.protocol.packet.play.block; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class BlockAction implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockChange.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockChange.java similarity index 72% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockChange.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockChange.java index 71cc44b3..943a1048 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockChange.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockChange.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.block; +package de.bauhd.sculk.protocol.packet.play.block; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class BlockChange implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockDestroyStage.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockDestroyStage.java similarity index 79% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockDestroyStage.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockDestroyStage.java index 4ccc22e0..940bcd0f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockDestroyStage.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockDestroyStage.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.block; +package de.bauhd.sculk.protocol.packet.play.block; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class BlockDestroyStage implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockEntityData.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockEntityData.java similarity index 79% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockEntityData.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockEntityData.java index 01179fe0..7635e6ef 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockEntityData.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockEntityData.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.block; +package de.bauhd.sculk.protocol.packet.play.block; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.nbt.CompoundBinaryTag; public final class BlockEntityData implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockUpdate.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockUpdate.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockUpdate.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockUpdate.java index 567e7b53..cf40da0b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/block/BlockUpdate.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/block/BlockUpdate.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.block; +package de.bauhd.sculk.protocol.packet.play.block; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class BlockUpdate implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/ChatCommand.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/ChatCommand.java similarity index 84% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/ChatCommand.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/ChatCommand.java index 42d46212..062be949 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/ChatCommand.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/ChatCommand.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.command; +package de.bauhd.sculk.protocol.packet.play.command; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class ChatCommand implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/CommandSuggestionsResponse.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/CommandSuggestionsResponse.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/CommandSuggestionsResponse.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/CommandSuggestionsResponse.java index 0be9127e..d973b104 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/CommandSuggestionsResponse.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/CommandSuggestionsResponse.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.command; +package de.bauhd.sculk.protocol.packet.play.command; import com.mojang.brigadier.suggestion.Suggestion; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; import java.util.List; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/Commands.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/Commands.java similarity index 96% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/Commands.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/Commands.java index 229c4efa..940463b5 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/command/Commands.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/command/Commands.java @@ -1,13 +1,13 @@ -package de.bauhd.minecraft.server.protocol.packet.play.command; +package de.bauhd.sculk.protocol.packet.play.command; import com.mojang.brigadier.arguments.*; import com.mojang.brigadier.tree.ArgumentCommandNode; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; import com.mojang.brigadier.tree.RootCommandNode; -import de.bauhd.minecraft.server.command.CommandSource; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap; import java.util.ArrayDeque; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ClickContainer.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ClickContainer.java similarity index 87% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ClickContainer.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ClickContainer.java index 2bcb536c..7e5602db 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ClickContainer.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ClickContainer.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.protocol.packet.play.container; +package de.bauhd.sculk.protocol.packet.play.container; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ClickContainerButton.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ClickContainerButton.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ClickContainerButton.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ClickContainerButton.java index 4aee4d25..b64cf276 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ClickContainerButton.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ClickContainerButton.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.container; +package de.bauhd.sculk.protocol.packet.play.container; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class ClickContainerButton implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/CloseContainer.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/CloseContainer.java similarity index 76% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/CloseContainer.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/CloseContainer.java index aaed0db5..b1447156 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/CloseContainer.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/CloseContainer.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.container; +package de.bauhd.sculk.protocol.packet.play.container; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class CloseContainer implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerContent.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerContent.java similarity index 76% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerContent.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerContent.java index 9c8cacac..c6f66717 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerContent.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerContent.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.container; +package de.bauhd.sculk.protocol.packet.play.container; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.util.ItemList; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.util.ItemList; public final class ContainerContent implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerProperty.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerProperty.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerProperty.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerProperty.java index ab8f2536..173faa7a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerProperty.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerProperty.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.container; +package de.bauhd.sculk.protocol.packet.play.container; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class ContainerProperty implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerSlot.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerSlot.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerSlot.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerSlot.java index b90780c2..143f9f4e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/ContainerSlot.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/ContainerSlot.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.container; +package de.bauhd.sculk.protocol.packet.play.container; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class ContainerSlot implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/OpenScreen.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/OpenScreen.java similarity index 77% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/OpenScreen.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/OpenScreen.java index 2549cb44..8d9b721b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/container/OpenScreen.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/container/OpenScreen.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.container; +package de.bauhd.sculk.protocol.packet.play.container; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class OpenScreen implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityPosition.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityPosition.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityPosition.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityPosition.java index 534ad83e..ba303264 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityPosition.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityPosition.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class EntityPosition implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityPositionAndRotation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityPositionAndRotation.java similarity index 88% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityPositionAndRotation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityPositionAndRotation.java index fff7d322..577ab366 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityPositionAndRotation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityPositionAndRotation.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class EntityPositionAndRotation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityRotation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityRotation.java similarity index 79% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityRotation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityRotation.java index 28e93c70..b345b155 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/EntityRotation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/EntityRotation.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class EntityRotation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/HeadRotation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/HeadRotation.java similarity index 69% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/HeadRotation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/HeadRotation.java index e6a9315e..4b523fc5 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/HeadRotation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/HeadRotation.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class HeadRotation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerOnGround.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerOnGround.java similarity index 65% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerOnGround.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerOnGround.java index 730c3c6a..87cbbf8e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerOnGround.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerOnGround.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class PlayerOnGround implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerPosition.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerPosition.java similarity index 82% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerPosition.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerPosition.java index 7130d97b..a352e3ed 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerPosition.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerPosition.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class PlayerPosition implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerPositionAndRotation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerPositionAndRotation.java similarity index 86% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerPositionAndRotation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerPositionAndRotation.java index 9a5b6d48..e75c12e6 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerPositionAndRotation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerPositionAndRotation.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class PlayerPositionAndRotation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerRotation.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerRotation.java similarity index 80% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerRotation.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerRotation.java index b5ea0e9e..a95fc088 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/position/PlayerRotation.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/position/PlayerRotation.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.play.position; +package de.bauhd.sculk.protocol.packet.play.position; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class PlayerRotation implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/DisplayObjective.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/DisplayObjective.java similarity index 71% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/DisplayObjective.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/DisplayObjective.java index c13dfa20..f7bc1a5b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/DisplayObjective.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/DisplayObjective.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.scoreboard; +package de.bauhd.sculk.protocol.packet.play.scoreboard; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class DisplayObjective implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/UpdateObjectives.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/UpdateObjectives.java similarity index 79% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/UpdateObjectives.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/UpdateObjectives.java index 9a8f6442..686cc7dd 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/UpdateObjectives.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/UpdateObjectives.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.scoreboard; +package de.bauhd.sculk.protocol.packet.play.scoreboard; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class UpdateObjectives implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/UpdateScore.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/UpdateScore.java similarity index 78% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/UpdateScore.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/UpdateScore.java index ab4de93f..290042b4 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/scoreboard/UpdateScore.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/scoreboard/UpdateScore.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.scoreboard; +package de.bauhd.sculk.protocol.packet.play.scoreboard; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class UpdateScore implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/ClearTitles.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/ClearTitles.java similarity index 70% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/ClearTitles.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/ClearTitles.java index 3a80104a..23a34ee3 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/ClearTitles.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/ClearTitles.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.title; +package de.bauhd.sculk.protocol.packet.play.title; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class ClearTitles implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/Subtitle.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/Subtitle.java similarity index 72% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/Subtitle.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/Subtitle.java index 3cbe8691..7a2c3934 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/Subtitle.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/Subtitle.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.title; +package de.bauhd.sculk.protocol.packet.play.title; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class Subtitle implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/Title.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/Title.java similarity index 72% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/Title.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/Title.java index 7f252dd1..a732b61e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/Title.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/Title.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.title; +package de.bauhd.sculk.protocol.packet.play.title; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.text.Component; public final class Title implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/TitleAnimationTimes.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/TitleAnimationTimes.java similarity index 81% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/TitleAnimationTimes.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/TitleAnimationTimes.java index 426cec26..f7c67b26 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/play/title/TitleAnimationTimes.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/play/title/TitleAnimationTimes.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.play.title; +package de.bauhd.sculk.protocol.packet.play.title; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class TitleAnimationTimes implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusPing.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusPing.java similarity index 74% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusPing.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusPing.java index e4c7f664..6af1301e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusPing.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusPing.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.protocol.packet.status; +package de.bauhd.sculk.protocol.packet.status; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class StatusPing implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusRequest.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusRequest.java similarity index 68% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusRequest.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusRequest.java index 78dd181e..ea8ff50d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusRequest.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusRequest.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.status; +package de.bauhd.sculk.protocol.packet.status; -import de.bauhd.minecraft.server.protocol.packet.Packet; -import de.bauhd.minecraft.server.protocol.packet.PacketHandler; +import de.bauhd.sculk.protocol.packet.Packet; +import de.bauhd.sculk.protocol.packet.PacketHandler; public final class StatusRequest implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusResponse.java b/server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusResponse.java similarity index 71% rename from server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusResponse.java rename to server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusResponse.java index df530356..5a34294d 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/protocol/packet/status/StatusResponse.java +++ b/server/src/main/java/de/bauhd/sculk/protocol/packet/status/StatusResponse.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.protocol.packet.status; +package de.bauhd.sculk.protocol.packet.status; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.Packet; public final class StatusResponse implements Packet { diff --git a/server/src/main/java/de/bauhd/minecraft/server/registry/SimpleRegistry.java b/server/src/main/java/de/bauhd/sculk/registry/SimpleRegistry.java similarity index 96% rename from server/src/main/java/de/bauhd/minecraft/server/registry/SimpleRegistry.java rename to server/src/main/java/de/bauhd/sculk/registry/SimpleRegistry.java index e0ac7aec..715c198a 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/registry/SimpleRegistry.java +++ b/server/src/main/java/de/bauhd/sculk/registry/SimpleRegistry.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.registry; +package de.bauhd.sculk.registry; import net.kyori.adventure.nbt.CompoundBinaryTag; import net.kyori.adventure.nbt.ListBinaryTag; diff --git a/server/src/main/java/de/bauhd/minecraft/server/terminal/SimpleTerminal.java b/server/src/main/java/de/bauhd/sculk/terminal/SimpleTerminal.java similarity index 90% rename from server/src/main/java/de/bauhd/minecraft/server/terminal/SimpleTerminal.java rename to server/src/main/java/de/bauhd/sculk/terminal/SimpleTerminal.java index 3edbe90e..634d2502 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/terminal/SimpleTerminal.java +++ b/server/src/main/java/de/bauhd/sculk/terminal/SimpleTerminal.java @@ -1,7 +1,8 @@ -package de.bauhd.minecraft.server.terminal; +package de.bauhd.sculk.terminal; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.command.CommandSource; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.terminal.TerminalAppender; import net.kyori.adventure.chat.ChatType; import net.kyori.adventure.identity.Identity; import net.kyori.adventure.permission.PermissionChecker; @@ -28,18 +29,18 @@ public final class SimpleTerminal implements CommandSource { private static final ComponentLogger COMPONENT_LOGGER = ComponentLogger.logger(SimpleTerminal.class); private static final String PROMPT = "> "; - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final LineReader lineReader; private final Pointers pointers = Pointers.builder() .withStatic(Identity.NAME, "CONSOLE") .withStatic(PermissionChecker.POINTER, PermissionChecker.always(TriState.TRUE)) .build(); - public SimpleTerminal(final AdvancedMinecraftServer server) { + public SimpleTerminal(final SculkMinecraftServer server) { this.server = server; try { this.lineReader = LineReaderBuilder.builder() - .appName("Minecraft-Server") + .appName("Sculk-Server") .terminal(TerminalBuilder.builder() .dumb(true) .build()) diff --git a/server/src/main/java/de/bauhd/minecraft/server/util/BossBarListener.java b/server/src/main/java/de/bauhd/sculk/util/BossBarListener.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/util/BossBarListener.java rename to server/src/main/java/de/bauhd/sculk/util/BossBarListener.java index 5f9ebb53..ff66f662 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/util/BossBarListener.java +++ b/server/src/main/java/de/bauhd/sculk/util/BossBarListener.java @@ -1,14 +1,14 @@ -package de.bauhd.minecraft.server.util; +package de.bauhd.sculk.util; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.protocol.packet.Packet; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.protocol.packet.Packet; import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.text.Component; import org.jetbrains.annotations.NotNull; import java.util.*; -import static de.bauhd.minecraft.server.protocol.packet.play.BossBar.update; +import static de.bauhd.sculk.protocol.packet.play.BossBar.update; public final class BossBarListener implements BossBar.Listener { @@ -61,14 +61,14 @@ public void showBossBar(final MinecraftPlayer player, final BossBar bar) { } final var holder = this.bossBars.get(bar); holder.subscribers.add(player); - player.send(de.bauhd.minecraft.server.protocol.packet.play.BossBar + player.send(de.bauhd.sculk.protocol.packet.play.BossBar .add(holder.uniqueId, bar.name(), bar.progress(), bar.color().ordinal(), bar.overlay().ordinal(), this.flags(bar))); } public void hideBossBar(final MinecraftPlayer player, final BossBar bar) { final var holder = this.bossBars.get(bar); holder.subscribers.remove(player); - player.send(de.bauhd.minecraft.server.protocol.packet.play.BossBar.remove(holder.uniqueId)); + player.send(de.bauhd.sculk.protocol.packet.play.BossBar.remove(holder.uniqueId)); } public void onDisconnect(final MinecraftPlayer player) { diff --git a/server/src/main/java/de/bauhd/minecraft/server/util/Constant.java b/server/src/main/java/de/bauhd/sculk/util/Constant.java similarity index 94% rename from server/src/main/java/de/bauhd/minecraft/server/util/Constant.java rename to server/src/main/java/de/bauhd/sculk/util/Constant.java index 7d2bff03..0e55bfec 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/util/Constant.java +++ b/server/src/main/java/de/bauhd/sculk/util/Constant.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.util; +package de.bauhd.sculk.util; public final class Constant { diff --git a/server/src/main/java/de/bauhd/minecraft/server/util/CoordinateUtil.java b/server/src/main/java/de/bauhd/sculk/util/CoordinateUtil.java similarity index 92% rename from server/src/main/java/de/bauhd/minecraft/server/util/CoordinateUtil.java rename to server/src/main/java/de/bauhd/sculk/util/CoordinateUtil.java index 39bac408..b60dad91 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/util/CoordinateUtil.java +++ b/server/src/main/java/de/bauhd/sculk/util/CoordinateUtil.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.util; +package de.bauhd.sculk.util; public final class CoordinateUtil { diff --git a/server/src/main/java/de/bauhd/minecraft/server/util/EncryptionUtil.java b/server/src/main/java/de/bauhd/sculk/util/EncryptionUtil.java similarity index 96% rename from server/src/main/java/de/bauhd/minecraft/server/util/EncryptionUtil.java rename to server/src/main/java/de/bauhd/sculk/util/EncryptionUtil.java index e9c6fbd3..8594bab9 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/util/EncryptionUtil.java +++ b/server/src/main/java/de/bauhd/sculk/util/EncryptionUtil.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.util; +package de.bauhd.sculk.util; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; diff --git a/server/src/main/java/de/bauhd/minecraft/server/util/ItemList.java b/server/src/main/java/de/bauhd/sculk/util/ItemList.java similarity index 87% rename from server/src/main/java/de/bauhd/minecraft/server/util/ItemList.java rename to server/src/main/java/de/bauhd/sculk/util/ItemList.java index a67d7aa5..7efcb83f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/util/ItemList.java +++ b/server/src/main/java/de/bauhd/sculk/util/ItemList.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.util; +package de.bauhd.sculk.util; -import de.bauhd.minecraft.server.container.item.ItemStack; +import de.bauhd.sculk.container.item.ItemStack; import java.util.AbstractList; diff --git a/server/src/main/java/de/bauhd/minecraft/server/util/MojangUtil.java b/server/src/main/java/de/bauhd/sculk/util/MojangUtil.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/util/MojangUtil.java rename to server/src/main/java/de/bauhd/sculk/util/MojangUtil.java index d63cdea2..7541e66b 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/util/MojangUtil.java +++ b/server/src/main/java/de/bauhd/sculk/util/MojangUtil.java @@ -1,9 +1,9 @@ -package de.bauhd.minecraft.server.util; +package de.bauhd.sculk.util; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.entity.player.GameProfile; +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.entity.player.GameProfile; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -45,7 +45,7 @@ public static GameProfile.Property getSkinFromName(final String name) { } public static GameProfile hasJoined(final String username, final String serverId) { - return AdvancedMinecraftServer.GSON.fromJson(apiRequest(String.format(HAS_JOINED_URL, username, serverId)), GameProfile.class); + return SculkMinecraftServer.GSON.fromJson(apiRequest(String.format(HAS_JOINED_URL, username, serverId)), GameProfile.class); } public static UUID fromMojang(String uniqueId) { diff --git a/server/src/main/java/de/bauhd/minecraft/server/util/Utf8.java b/server/src/main/java/de/bauhd/sculk/util/Utf8.java similarity index 97% rename from server/src/main/java/de/bauhd/minecraft/server/util/Utf8.java rename to server/src/main/java/de/bauhd/sculk/util/Utf8.java index 118cbbc3..c2b431ee 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/util/Utf8.java +++ b/server/src/main/java/de/bauhd/sculk/util/Utf8.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.util; +package de.bauhd.sculk.util; public final class Utf8 { diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/MinecraftWorld.java b/server/src/main/java/de/bauhd/sculk/world/MinecraftWorld.java similarity index 74% rename from server/src/main/java/de/bauhd/minecraft/server/world/MinecraftWorld.java rename to server/src/main/java/de/bauhd/sculk/world/MinecraftWorld.java index f0614630..f5bf247f 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/MinecraftWorld.java +++ b/server/src/main/java/de/bauhd/sculk/world/MinecraftWorld.java @@ -1,28 +1,26 @@ -package de.bauhd.minecraft.server.world; - -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.MinecraftServer; -import de.bauhd.minecraft.server.entity.AbstractEntity; -import de.bauhd.minecraft.server.entity.Entity; -import de.bauhd.minecraft.server.entity.player.GameMode; -import de.bauhd.minecraft.server.entity.player.Player; -import de.bauhd.minecraft.server.world.block.BlockState; -import de.bauhd.minecraft.server.world.chunk.ChunkGenerator; -import de.bauhd.minecraft.server.world.chunk.MinecraftChunk; -import de.bauhd.minecraft.server.world.chunk.loader.ChunkLoader; -import de.bauhd.minecraft.server.world.dimension.Dimension; +package de.bauhd.sculk.world; + +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.MinecraftServer; +import de.bauhd.sculk.entity.AbstractEntity; +import de.bauhd.sculk.entity.Entity; +import de.bauhd.sculk.entity.player.GameMode; +import de.bauhd.sculk.entity.player.Player; +import de.bauhd.sculk.world.block.BlockState; +import de.bauhd.sculk.world.chunk.ChunkGenerator; +import de.bauhd.sculk.world.chunk.MinecraftChunk; +import de.bauhd.sculk.world.chunk.loader.ChunkLoader; +import de.bauhd.sculk.world.dimension.Dimension; +import de.bauhd.sculk.util.CoordinateUtil; import it.unimi.dsi.fastutil.longs.Long2ObjectMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; -import static de.bauhd.minecraft.server.util.CoordinateUtil.chunkCoordinate; -import static de.bauhd.minecraft.server.util.CoordinateUtil.chunkIndex; - public class MinecraftWorld implements World { - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final String name; private final Dimension dimension; private final ChunkLoader loader; @@ -32,7 +30,7 @@ public class MinecraftWorld implements World { private Worker worker; private boolean alive; - public MinecraftWorld(final AdvancedMinecraftServer server, final String name, final Dimension dimension, + public MinecraftWorld(final SculkMinecraftServer server, final String name, final Dimension dimension, final ChunkLoader loader, final Position spawnPosition, final GameMode defaultGameMode) { this.server = server; this.name = name; @@ -84,7 +82,7 @@ public void setBlock(int x, int y, int z, @NotNull BlockState block) { @Override public @NotNull MinecraftChunk getChunk(int chunkX, int chunkZ) { - var chunk = this.chunks.get(chunkIndex(chunkX, chunkZ)); + var chunk = this.chunks.get(CoordinateUtil.chunkIndex(chunkX, chunkZ)); if (chunk == null) { chunk = this.loadChunk(chunkX, chunkZ); } @@ -93,7 +91,7 @@ public void setBlock(int x, int y, int z, @NotNull BlockState block) { @Override public @NotNull MinecraftChunk getChunkAt(int x, int z) { - return this.getChunk(chunkCoordinate(x), chunkCoordinate(z)); + return this.getChunk(CoordinateUtil.chunkCoordinate(x), CoordinateUtil.chunkCoordinate(z)); } @Override @@ -110,7 +108,7 @@ public boolean isAlive() { protected MinecraftChunk loadChunk(final int chunkX, final int chunkZ) { final var chunk = this.loader.loadChunk(this, chunkX, chunkZ); - this.chunks.put(chunkIndex(chunk.getX(), chunk.getZ()), chunk); + this.chunks.put(CoordinateUtil.chunkIndex(chunk.getX(), chunk.getZ()), chunk); return chunk; } diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/Worker.java b/server/src/main/java/de/bauhd/sculk/world/Worker.java similarity index 96% rename from server/src/main/java/de/bauhd/minecraft/server/world/Worker.java rename to server/src/main/java/de/bauhd/sculk/world/Worker.java index 700dd289..a2a22180 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/Worker.java +++ b/server/src/main/java/de/bauhd/sculk/world/Worker.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world; +package de.bauhd.sculk.world; public final class Worker extends Thread { diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/block/BlockParent.java b/server/src/main/java/de/bauhd/sculk/world/block/BlockParent.java similarity index 94% rename from server/src/main/java/de/bauhd/minecraft/server/world/block/BlockParent.java rename to server/src/main/java/de/bauhd/sculk/world/block/BlockParent.java index 3f8da98c..fef98b05 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/block/BlockParent.java +++ b/server/src/main/java/de/bauhd/sculk/world/block/BlockParent.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.block; +package de.bauhd.sculk.world.block; import java.util.Map; diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/block/MineBlockState.java b/server/src/main/java/de/bauhd/sculk/world/block/MineBlockState.java similarity index 98% rename from server/src/main/java/de/bauhd/minecraft/server/world/block/MineBlockState.java rename to server/src/main/java/de/bauhd/sculk/world/block/MineBlockState.java index f796c2d7..7a320ad7 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/block/MineBlockState.java +++ b/server/src/main/java/de/bauhd/sculk/world/block/MineBlockState.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.block; +package de.bauhd.sculk.world.block; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/LightData.java b/server/src/main/java/de/bauhd/sculk/world/chunk/LightData.java similarity index 92% rename from server/src/main/java/de/bauhd/minecraft/server/world/chunk/LightData.java rename to server/src/main/java/de/bauhd/sculk/world/chunk/LightData.java index 10d0145a..c798ad95 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/LightData.java +++ b/server/src/main/java/de/bauhd/sculk/world/chunk/LightData.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.chunk; +package de.bauhd.sculk.world.chunk; -import de.bauhd.minecraft.server.protocol.Buffer; +import de.bauhd.sculk.protocol.Buffer; import java.util.BitSet; import java.util.List; diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/MinecraftChunk.java b/server/src/main/java/de/bauhd/sculk/world/chunk/MinecraftChunk.java similarity index 74% rename from server/src/main/java/de/bauhd/minecraft/server/world/chunk/MinecraftChunk.java rename to server/src/main/java/de/bauhd/sculk/world/chunk/MinecraftChunk.java index b65cf709..794f662e 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/MinecraftChunk.java +++ b/server/src/main/java/de/bauhd/sculk/world/chunk/MinecraftChunk.java @@ -1,17 +1,18 @@ -package de.bauhd.minecraft.server.world.chunk; - -import de.bauhd.minecraft.server.entity.AbstractEntity; -import de.bauhd.minecraft.server.entity.player.MinecraftPlayer; -import de.bauhd.minecraft.server.protocol.Buffer; -import de.bauhd.minecraft.server.protocol.packet.play.ChunkDataAndUpdateLight; -import de.bauhd.minecraft.server.protocol.packet.play.block.BlockUpdate; -import de.bauhd.minecraft.server.world.MinecraftWorld; -import de.bauhd.minecraft.server.world.biome.Biome; -import de.bauhd.minecraft.server.world.block.Block; -import de.bauhd.minecraft.server.world.block.BlockState; -import de.bauhd.minecraft.server.world.dimension.Dimension; -import de.bauhd.minecraft.server.world.section.Section; -import io.netty5.buffer.DefaultBufferAllocators; +package de.bauhd.sculk.world.chunk; + +import de.bauhd.sculk.entity.AbstractEntity; +import de.bauhd.sculk.entity.player.MinecraftPlayer; +import de.bauhd.sculk.protocol.Buffer; +import de.bauhd.sculk.protocol.packet.play.ChunkDataAndUpdateLight; +import de.bauhd.sculk.protocol.packet.play.block.BlockUpdate; +import de.bauhd.sculk.world.MinecraftWorld; +import de.bauhd.sculk.world.biome.Biome; +import de.bauhd.sculk.world.block.Block; +import de.bauhd.sculk.world.block.BlockState; +import de.bauhd.sculk.world.dimension.Dimension; +import de.bauhd.sculk.world.section.Section; +import de.bauhd.sculk.util.CoordinateUtil; +import io.netty.buffer.ByteBufAllocator; import it.unimi.dsi.fastutil.Pair; import org.jetbrains.annotations.NotNull; @@ -19,9 +20,6 @@ import java.util.BitSet; import java.util.List; -import static de.bauhd.minecraft.server.util.CoordinateUtil.chunkCoordinate; -import static de.bauhd.minecraft.server.util.CoordinateUtil.relativeCoordinate; - public final class MinecraftChunk implements Chunk { private final MinecraftWorld world; @@ -67,7 +65,7 @@ public int getZ() { @Override public void setBlock(int x, int y, int z, @NotNull BlockState block) { final var id = block.getId(); - this.section(y).blocks().set(relativeCoordinate(x), relativeCoordinate(y), relativeCoordinate(z), id); + this.section(y).blocks().set(CoordinateUtil.relativeCoordinate(x), CoordinateUtil.relativeCoordinate(y), CoordinateUtil.relativeCoordinate(z), id); this.packet = null; if (!this.viewers.isEmpty()) { final var packet = new BlockUpdate(x, y, z, id); @@ -79,12 +77,12 @@ public void setBlock(int x, int y, int z, @NotNull BlockState block) { @Override public @NotNull BlockState getBlock(int x, int y, int z) { - return Block.get(this.section(y).blocks().get(relativeCoordinate(x), relativeCoordinate(y), relativeCoordinate(z))); + return Block.get(this.section(y).blocks().get(CoordinateUtil.relativeCoordinate(x), CoordinateUtil.relativeCoordinate(y), CoordinateUtil.relativeCoordinate(z))); } @Override public void setBiome(int x, int y, int z, @NotNull Biome biome) { - this.section(y).biomes().set(relativeCoordinate(x) / 4, relativeCoordinate(y) / 4, relativeCoordinate(z) / 4, + this.section(y).biomes().set(CoordinateUtil.relativeCoordinate(x) / 4, CoordinateUtil.relativeCoordinate(y) / 4, CoordinateUtil.relativeCoordinate(z) / 4, biome.id()); this.packet = null; } @@ -104,11 +102,11 @@ public void send(MinecraftPlayer player) { } public Section section(final int y) { - return this.sections[chunkCoordinate(y) - this.dimension.minimumSections()]; + return this.sections[CoordinateUtil.chunkCoordinate(y) - this.dimension.minimumSections()]; } private Pair sectionsToData() { - final var buf = new Buffer(DefaultBufferAllocators.offHeapAllocator().allocate(this.sections.length * 8)); // minimum amount + final var buf = new Buffer(ByteBufAllocator.DEFAULT.buffer(this.sections.length * 8)); // minimum amount final var skyMask = new BitSet(); final var blockMask = new BitSet(); final var emptySkyMask = new BitSet(); diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/AnvilLoader.java b/server/src/main/java/de/bauhd/sculk/world/chunk/loader/AnvilLoader.java similarity index 86% rename from server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/AnvilLoader.java rename to server/src/main/java/de/bauhd/sculk/world/chunk/loader/AnvilLoader.java index 5a387edb..4e840371 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/AnvilLoader.java +++ b/server/src/main/java/de/bauhd/sculk/world/chunk/loader/AnvilLoader.java @@ -1,12 +1,14 @@ -package de.bauhd.minecraft.server.world.chunk.loader; - -import de.bauhd.minecraft.server.AdvancedMinecraftServer; -import de.bauhd.minecraft.server.world.MinecraftWorld; -import de.bauhd.minecraft.server.world.block.Block; -import de.bauhd.minecraft.server.world.chunk.ChunkGenerator; -import de.bauhd.minecraft.server.world.chunk.MinecraftChunk; -import de.bauhd.minecraft.server.world.section.PaletteHolder; -import de.bauhd.minecraft.server.world.section.Section; +package de.bauhd.sculk.world.chunk.loader; + +import de.bauhd.sculk.SculkMinecraftServer; +import de.bauhd.sculk.world.MinecraftWorld; +import de.bauhd.sculk.world.block.Block; +import de.bauhd.sculk.world.chunk.ChunkGenerator; +import de.bauhd.sculk.world.chunk.MinecraftChunk; +import de.bauhd.sculk.world.section.PaletteHolder; +import de.bauhd.sculk.world.section.Section; +import de.bauhd.sculk.util.CoordinateUtil; +import de.bauhd.sculk.world.chunk.Chunk; import net.kyori.adventure.nbt.BinaryTagIO; import net.kyori.adventure.nbt.CompoundBinaryTag; import net.kyori.adventure.nbt.ListBinaryTag; @@ -22,18 +24,15 @@ import java.util.HashMap; import java.util.Map; -import static de.bauhd.minecraft.server.util.CoordinateUtil.regionCoordinate; -import static de.bauhd.minecraft.server.world.chunk.Chunk.*; - public final class AnvilLoader extends DefaultChunkLoader { private static final int SECTOR_SIZE = 4096; - private final AdvancedMinecraftServer server; + private final SculkMinecraftServer server; private final Path regionPath; private final Map regionCache; - public AnvilLoader(final AdvancedMinecraftServer server, final ChunkGenerator generator, final Path path) { + public AnvilLoader(final SculkMinecraftServer server, final ChunkGenerator generator, final Path path) { super(generator); this.server = server; this.regionPath = path.resolve("region"); @@ -42,7 +41,7 @@ public AnvilLoader(final AdvancedMinecraftServer server, final ChunkGenerator ge @Override public @NotNull MinecraftChunk loadChunk(final MinecraftWorld world, final int x, final int z) { - final var fileName = "r." + regionCoordinate(x) + "." + regionCoordinate(z) + ".mca"; + final var fileName = "r." + CoordinateUtil.regionCoordinate(x) + "." + CoordinateUtil.regionCoordinate(z) + ".mca"; try { MinecraftChunk chunk; if (!this.regionCache.containsKey(fileName)) { @@ -133,10 +132,10 @@ private MinecraftChunk getChunk(final MinecraftWorld world, final int chunkX, fi } else { blocks.setIndirectPalette(); final var blockStates = this.uncompressedBlockStates(states); - for (var y = 0; y < CHUNK_SECTION_SIZE; y++) { - for (var z = 0; z < CHUNK_SECTION_SIZE; z++) { - for (var x = 0; x < CHUNK_SECTION_SIZE; x++) { - final var blockIndex = y * CHUNK_SECTION_SIZE * CHUNK_SECTION_SIZE + z * CHUNK_SECTION_SIZE + x; + for (var y = 0; y < Chunk.CHUNK_SECTION_SIZE; y++) { + for (var z = 0; z < Chunk.CHUNK_SECTION_SIZE; z++) { + for (var x = 0; x < Chunk.CHUNK_SECTION_SIZE; x++) { + final var blockIndex = y * Chunk.CHUNK_SECTION_SIZE * Chunk.CHUNK_SECTION_SIZE + z * Chunk.CHUNK_SECTION_SIZE + x; final var paletteIndex = blockStates[blockIndex]; blocks.set(x, y, z, palette[paletteIndex]); } @@ -160,12 +159,12 @@ private MinecraftChunk getChunk(final MinecraftWorld world, final int chunkX, fi } else { biomes.setIndirectPalette(); final var biomeIndexes = this.uncompressedBiomeIndexes(biomesCompound, biomePalette.size()); - for (var y = 0; y < CHUNK_SECTION_SIZE; y++) { - for (var z = 0; z < CHUNK_SIZE_Z; z++) { - for (var x = 0; x < CHUNK_SIZE_X; x++) { - final var finalX = (chunkX * CHUNK_SIZE_X + x); - final var finalZ = (chunkZ * CHUNK_SIZE_Z + z); - final var finalY = (i * CHUNK_SECTION_SIZE + y); + for (var y = 0; y < Chunk.CHUNK_SECTION_SIZE; y++) { + for (var z = 0; z < Chunk.CHUNK_SIZE_Z; z++) { + for (var x = 0; x < Chunk.CHUNK_SIZE_X; x++) { + final var finalX = (chunkX * Chunk.CHUNK_SIZE_X + x); + final var finalZ = (chunkZ * Chunk.CHUNK_SIZE_Z + z); + final var finalY = (i * Chunk.CHUNK_SECTION_SIZE + y); final var index = x / 4 + (z / 4) * 4 + (y / 4) * 16; biomes.set(finalX, finalY, finalZ, biomeIndexes[index]); } diff --git a/server/src/main/java/de/bauhd/sculk/world/chunk/loader/ChunkLoader.java b/server/src/main/java/de/bauhd/sculk/world/chunk/loader/ChunkLoader.java new file mode 100644 index 00000000..e628d11e --- /dev/null +++ b/server/src/main/java/de/bauhd/sculk/world/chunk/loader/ChunkLoader.java @@ -0,0 +1,13 @@ +package de.bauhd.sculk.world.chunk.loader; + +import de.bauhd.sculk.world.MinecraftWorld; +import de.bauhd.sculk.world.chunk.ChunkGenerator; +import de.bauhd.sculk.world.chunk.MinecraftChunk; +import org.jetbrains.annotations.NotNull; + +public interface ChunkLoader { + + @NotNull MinecraftChunk loadChunk(MinecraftWorld world, int x, int z); + + @NotNull ChunkGenerator getGenerator(); +} diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/DefaultChunkLoader.java b/server/src/main/java/de/bauhd/sculk/world/chunk/loader/DefaultChunkLoader.java similarity index 71% rename from server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/DefaultChunkLoader.java rename to server/src/main/java/de/bauhd/sculk/world/chunk/loader/DefaultChunkLoader.java index eb3a81fd..45296fe0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/chunk/loader/DefaultChunkLoader.java +++ b/server/src/main/java/de/bauhd/sculk/world/chunk/loader/DefaultChunkLoader.java @@ -1,8 +1,8 @@ -package de.bauhd.minecraft.server.world.chunk.loader; +package de.bauhd.sculk.world.chunk.loader; -import de.bauhd.minecraft.server.world.MinecraftWorld; -import de.bauhd.minecraft.server.world.chunk.ChunkGenerator; -import de.bauhd.minecraft.server.world.chunk.MinecraftChunk; +import de.bauhd.sculk.world.MinecraftWorld; +import de.bauhd.sculk.world.chunk.ChunkGenerator; +import de.bauhd.sculk.world.chunk.MinecraftChunk; import org.jetbrains.annotations.NotNull; public class DefaultChunkLoader implements ChunkLoader { diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/dimension/DimensionRegistry.java b/server/src/main/java/de/bauhd/sculk/world/dimension/DimensionRegistry.java similarity index 97% rename from server/src/main/java/de/bauhd/minecraft/server/world/dimension/DimensionRegistry.java rename to server/src/main/java/de/bauhd/sculk/world/dimension/DimensionRegistry.java index 9004f87e..69ba70d0 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/dimension/DimensionRegistry.java +++ b/server/src/main/java/de/bauhd/sculk/world/dimension/DimensionRegistry.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.dimension; +package de.bauhd.sculk.world.dimension; -import de.bauhd.minecraft.server.registry.SimpleRegistry; +import de.bauhd.sculk.registry.SimpleRegistry; import net.kyori.adventure.nbt.CompoundBinaryTag; import org.jetbrains.annotations.NotNull; diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/section/DirectIndirectPalette.java b/server/src/main/java/de/bauhd/sculk/world/section/DirectIndirectPalette.java similarity index 98% rename from server/src/main/java/de/bauhd/minecraft/server/world/section/DirectIndirectPalette.java rename to server/src/main/java/de/bauhd/sculk/world/section/DirectIndirectPalette.java index 80613031..f9e4d186 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/section/DirectIndirectPalette.java +++ b/server/src/main/java/de/bauhd/sculk/world/section/DirectIndirectPalette.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.section; +package de.bauhd.sculk.world.section; -import de.bauhd.minecraft.server.protocol.Buffer; +import de.bauhd.sculk.protocol.Buffer; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/section/EmptyPalette.java b/server/src/main/java/de/bauhd/sculk/world/section/EmptyPalette.java similarity index 87% rename from server/src/main/java/de/bauhd/minecraft/server/world/section/EmptyPalette.java rename to server/src/main/java/de/bauhd/sculk/world/section/EmptyPalette.java index c7441b84..742d3ef7 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/section/EmptyPalette.java +++ b/server/src/main/java/de/bauhd/sculk/world/section/EmptyPalette.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.section; +package de.bauhd.sculk.world.section; -import de.bauhd.minecraft.server.protocol.Buffer; +import de.bauhd.sculk.protocol.Buffer; public final class EmptyPalette implements Palette { diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/section/Palette.java b/server/src/main/java/de/bauhd/sculk/world/section/Palette.java similarity index 89% rename from server/src/main/java/de/bauhd/minecraft/server/world/section/Palette.java rename to server/src/main/java/de/bauhd/sculk/world/section/Palette.java index 7c5a41e4..e8d33f25 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/section/Palette.java +++ b/server/src/main/java/de/bauhd/sculk/world/section/Palette.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.section; +package de.bauhd.sculk.world.section; -import de.bauhd.minecraft.server.protocol.Buffer; +import de.bauhd.sculk.protocol.Buffer; public interface Palette { diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/section/PaletteHolder.java b/server/src/main/java/de/bauhd/sculk/world/section/PaletteHolder.java similarity index 97% rename from server/src/main/java/de/bauhd/minecraft/server/world/section/PaletteHolder.java rename to server/src/main/java/de/bauhd/sculk/world/section/PaletteHolder.java index 1d0b7fd7..11281deb 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/section/PaletteHolder.java +++ b/server/src/main/java/de/bauhd/sculk/world/section/PaletteHolder.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.section; +package de.bauhd.sculk.world.section; -import de.bauhd.minecraft.server.protocol.Buffer; +import de.bauhd.sculk.protocol.Buffer; import it.unimi.dsi.fastutil.ints.IntOpenHashSet; public final class PaletteHolder implements Palette { diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/section/Section.java b/server/src/main/java/de/bauhd/sculk/world/section/Section.java similarity index 96% rename from server/src/main/java/de/bauhd/minecraft/server/world/section/Section.java rename to server/src/main/java/de/bauhd/sculk/world/section/Section.java index 6495718d..708e3205 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/section/Section.java +++ b/server/src/main/java/de/bauhd/sculk/world/section/Section.java @@ -1,4 +1,4 @@ -package de.bauhd.minecraft.server.world.section; +package de.bauhd.sculk.world.section; import java.util.Arrays; diff --git a/server/src/main/java/de/bauhd/minecraft/server/world/section/SingleValuedPalette.java b/server/src/main/java/de/bauhd/sculk/world/section/SingleValuedPalette.java similarity index 92% rename from server/src/main/java/de/bauhd/minecraft/server/world/section/SingleValuedPalette.java rename to server/src/main/java/de/bauhd/sculk/world/section/SingleValuedPalette.java index a6511682..a22c0e12 100644 --- a/server/src/main/java/de/bauhd/minecraft/server/world/section/SingleValuedPalette.java +++ b/server/src/main/java/de/bauhd/sculk/world/section/SingleValuedPalette.java @@ -1,6 +1,6 @@ -package de.bauhd.minecraft.server.world.section; +package de.bauhd.sculk.world.section; -import de.bauhd.minecraft.server.protocol.Buffer; +import de.bauhd.sculk.protocol.Buffer; final class SingleValuedPalette implements Palette { diff --git a/server/src/main/resources/META-INF/services/proxy/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider b/server/src/main/resources/META-INF/services/proxy/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider index 584e82a4..39e3606b 100644 --- a/server/src/main/resources/META-INF/services/proxy/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider +++ b/server/src/main/resources/META-INF/services/proxy/src/main/resources/META-INF/services/net.kyori.adventure.text.logger.slf4j.ComponentLoggerProvider @@ -1 +1 @@ -de.bauhd.minecraft.server.adventure.AdventureLoggerProvider \ No newline at end of file +de.bauhd.sculk.adventure.AdventureLoggerProvider \ No newline at end of file diff --git a/server/src/test/java/de/bauhd/minecraft/server/test/event/EventTest.java b/server/src/test/java/de/bauhd/sculk/test/event/EventTest.java similarity index 69% rename from server/src/test/java/de/bauhd/minecraft/server/test/event/EventTest.java rename to server/src/test/java/de/bauhd/sculk/test/event/EventTest.java index e0035897..8bc02991 100644 --- a/server/src/test/java/de/bauhd/minecraft/server/test/event/EventTest.java +++ b/server/src/test/java/de/bauhd/sculk/test/event/EventTest.java @@ -1,8 +1,9 @@ -package de.bauhd.minecraft.server.test.event; +package de.bauhd.sculk.test.event; -import de.bauhd.minecraft.server.event.EventOrder; -import de.bauhd.minecraft.server.event.MineEventHandler; -import de.bauhd.minecraft.server.event.lifecycle.ServerInitializeEvent; +import de.bauhd.sculk.event.EventOrder; +import de.bauhd.sculk.event.MineEventHandler; +import de.bauhd.sculk.event.lifecycle.ServerInitializeEvent; +import de.bauhd.sculk.test.plugin.TestPlugin; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; @@ -10,7 +11,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Consumer; -import static de.bauhd.minecraft.server.test.plugin.TestPlugin.PLUGIN; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,7 +25,7 @@ void test() { final var listener2 = new AtomicLong(); final var initEvent = new ServerInitializeEvent(); - EVENT_HANDLER.register(PLUGIN, ServerInitializeEvent.class, EventOrder.LAST, event -> { + EVENT_HANDLER.register(TestPlugin.PLUGIN, ServerInitializeEvent.class, EventOrder.LAST, event -> { calls.getAndIncrement(); listener1.set(System.nanoTime()); }); @@ -33,11 +33,11 @@ void test() { calls.getAndIncrement(); listener2.set(System.nanoTime()); }; - EVENT_HANDLER.register(PLUGIN, ServerInitializeEvent.class, consumer); + EVENT_HANDLER.register(TestPlugin.PLUGIN, ServerInitializeEvent.class, consumer); EVENT_HANDLER.call(initEvent).join(); - EVENT_HANDLER.unregister(PLUGIN, consumer); + EVENT_HANDLER.unregister(TestPlugin.PLUGIN, consumer); EVENT_HANDLER.call(initEvent).join(); - EVENT_HANDLER.unregister(PLUGIN); + EVENT_HANDLER.unregister(TestPlugin.PLUGIN); EVENT_HANDLER.call(initEvent).join(); assertEquals(3, calls.get()); diff --git a/server/src/test/java/de/bauhd/minecraft/server/test/plugin/TestPlugin.java b/server/src/test/java/de/bauhd/sculk/test/plugin/TestPlugin.java similarity index 51% rename from server/src/test/java/de/bauhd/minecraft/server/test/plugin/TestPlugin.java rename to server/src/test/java/de/bauhd/sculk/test/plugin/TestPlugin.java index aed2667f..1c99fb1f 100644 --- a/server/src/test/java/de/bauhd/minecraft/server/test/plugin/TestPlugin.java +++ b/server/src/test/java/de/bauhd/sculk/test/plugin/TestPlugin.java @@ -1,7 +1,7 @@ -package de.bauhd.minecraft.server.test.plugin; +package de.bauhd.sculk.test.plugin; -import de.bauhd.minecraft.server.plugin.Plugin; -import de.bauhd.minecraft.server.plugin.PluginDescription; +import de.bauhd.sculk.plugin.Plugin; +import de.bauhd.sculk.plugin.PluginDescription; @PluginDescription(name = "Test", version = "1.0") public final class TestPlugin extends Plugin { diff --git a/settings.gradle.kts b/settings.gradle.kts index f41db0ef..2970b48b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "minecraft-server" +rootProject.name = "sculk-server" include( "api", "server", diff --git a/test-plugin/src/main/java/de/bauhd/minecraft/plugin/TestPlugin.java b/test-plugin/src/main/java/de/bauhd/sculk/plugin/TestPlugin.java similarity index 71% rename from test-plugin/src/main/java/de/bauhd/minecraft/plugin/TestPlugin.java rename to test-plugin/src/main/java/de/bauhd/sculk/plugin/TestPlugin.java index 5df04e48..7d538476 100644 --- a/test-plugin/src/main/java/de/bauhd/minecraft/plugin/TestPlugin.java +++ b/test-plugin/src/main/java/de/bauhd/sculk/plugin/TestPlugin.java @@ -1,26 +1,24 @@ -package de.bauhd.minecraft.plugin; +package de.bauhd.sculk.plugin; -import de.bauhd.minecraft.plugin.command.GameModeCommand; -import de.bauhd.minecraft.server.container.AnvilContainer; -import de.bauhd.minecraft.server.container.Container; -import de.bauhd.minecraft.server.container.item.ItemStack; -import de.bauhd.minecraft.server.container.item.Material; -import de.bauhd.minecraft.server.entity.player.GameMode; -import de.bauhd.minecraft.server.event.ResultedEvent; -import de.bauhd.minecraft.server.event.Subscribe; -import de.bauhd.minecraft.server.event.block.BlockBreakEvent; -import de.bauhd.minecraft.server.event.block.BlockPlaceEvent; -import de.bauhd.minecraft.server.event.player.PlayerInitialEvent; -import de.bauhd.minecraft.server.event.connection.ServerPingEvent; -import de.bauhd.minecraft.server.event.lifecycle.ServerInitializeEvent; -import de.bauhd.minecraft.server.event.player.PlayerClickContainerEvent; -import de.bauhd.minecraft.server.event.player.PlayerJoinEvent; -import de.bauhd.minecraft.server.event.player.PlayerUseItemEvent; -import de.bauhd.minecraft.server.plugin.Plugin; -import de.bauhd.minecraft.server.plugin.PluginDescription; -import de.bauhd.minecraft.server.world.Position; -import de.bauhd.minecraft.server.world.World; -import de.bauhd.minecraft.server.world.biome.Biome; +import de.bauhd.sculk.container.AnvilContainer; +import de.bauhd.sculk.container.Container; +import de.bauhd.sculk.container.item.ItemStack; +import de.bauhd.sculk.container.item.Material; +import de.bauhd.sculk.entity.player.GameMode; +import de.bauhd.sculk.event.ResultedEvent; +import de.bauhd.sculk.event.Subscribe; +import de.bauhd.sculk.event.block.BlockBreakEvent; +import de.bauhd.sculk.event.block.BlockPlaceEvent; +import de.bauhd.sculk.event.connection.ServerPingEvent; +import de.bauhd.sculk.event.lifecycle.ServerInitializeEvent; +import de.bauhd.sculk.event.player.PlayerClickContainerEvent; +import de.bauhd.sculk.event.player.PlayerInitialEvent; +import de.bauhd.sculk.event.player.PlayerJoinEvent; +import de.bauhd.sculk.event.player.PlayerUseItemEvent; +import de.bauhd.sculk.plugin.command.GameModeCommand; +import de.bauhd.sculk.world.Position; +import de.bauhd.sculk.world.World; +import de.bauhd.sculk.world.biome.Biome; import net.kyori.adventure.key.Key; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; @@ -36,7 +34,7 @@ public final class TestPlugin extends Plugin { @Subscribe public void handle(final ServerInitializeEvent event) { - this.getServer().getCommandHandler().register(new GameModeCommand()); + this.getServer().getCommandHandler().register(GameModeCommand.get()); final var testBiome = Biome.PLAINS.toBuilder(Key.key("test", "plains")) .effects(Biome.Effects.builder() diff --git a/test-plugin/src/main/java/de/bauhd/minecraft/plugin/command/GameModeCommand.java b/test-plugin/src/main/java/de/bauhd/sculk/plugin/command/GameModeCommand.java similarity index 63% rename from test-plugin/src/main/java/de/bauhd/minecraft/plugin/command/GameModeCommand.java rename to test-plugin/src/main/java/de/bauhd/sculk/plugin/command/GameModeCommand.java index 35b25c5f..ca4198a8 100644 --- a/test-plugin/src/main/java/de/bauhd/minecraft/plugin/command/GameModeCommand.java +++ b/test-plugin/src/main/java/de/bauhd/sculk/plugin/command/GameModeCommand.java @@ -1,20 +1,23 @@ -package de.bauhd.minecraft.plugin.command; +package de.bauhd.sculk.plugin.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.arguments.IntegerArgumentType; -import de.bauhd.minecraft.server.command.BrigadierCommand; -import de.bauhd.minecraft.server.entity.player.GameMode; -import de.bauhd.minecraft.server.entity.player.Player; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import com.mojang.brigadier.builder.RequiredArgumentBuilder; +import com.mojang.brigadier.tree.LiteralCommandNode; +import de.bauhd.sculk.command.CommandSource; +import de.bauhd.sculk.entity.player.GameMode; +import de.bauhd.sculk.entity.player.Player; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import java.util.concurrent.CompletableFuture; -public final class GameModeCommand extends BrigadierCommand { +public final class GameModeCommand { - public GameModeCommand() { - super(literal("gamemode") - .then(argument("gamemode", IntegerArgumentType.integer(0, 3)) + public static LiteralCommandNode get() { + return LiteralArgumentBuilder.literal("gamemode") + .then(RequiredArgumentBuilder.argument("gamemode", IntegerArgumentType.integer(0, 3)) .executes(context -> { if (context.getSource() instanceof Player player) { player.setGameMode(GameMode.class.getEnumConstants()[IntegerArgumentType.getInteger(context, "gamemode")]); @@ -32,7 +35,6 @@ public GameModeCommand() { context.getSource().sendMessage(Component.text("/gamemode <0-3>", NamedTextColor.RED)); return Command.SINGLE_SUCCESS; }) - .build()); + .build(); } - } diff --git a/test-plugin/src/main/java/de/bauhd/minecraft/plugin/world/TestGenerator.java b/test-plugin/src/main/java/de/bauhd/sculk/plugin/world/TestGenerator.java similarity index 73% rename from test-plugin/src/main/java/de/bauhd/minecraft/plugin/world/TestGenerator.java rename to test-plugin/src/main/java/de/bauhd/sculk/plugin/world/TestGenerator.java index d471d9b5..cbc5b918 100644 --- a/test-plugin/src/main/java/de/bauhd/minecraft/plugin/world/TestGenerator.java +++ b/test-plugin/src/main/java/de/bauhd/sculk/plugin/world/TestGenerator.java @@ -1,11 +1,11 @@ -package de.bauhd.minecraft.plugin.world; +package de.bauhd.sculk.plugin.world; -import de.bauhd.minecraft.server.world.biome.Biome; -import de.bauhd.minecraft.server.world.chunk.Chunk; -import de.bauhd.minecraft.server.world.chunk.ChunkGenerator; +import de.bauhd.sculk.world.biome.Biome; +import de.bauhd.sculk.world.chunk.Chunk; +import de.bauhd.sculk.world.chunk.ChunkGenerator; import org.jetbrains.annotations.NotNull; -import static de.bauhd.minecraft.server.world.block.Block.*; +import static de.bauhd.sculk.world.block.Block.*; public final class TestGenerator implements ChunkGenerator {