diff --git a/.editorconfig b/.editorconfig index fe005408..7ab7507d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -75,7 +75,7 @@ ij_java_case_statement_on_separate_line = true ij_java_catch_on_new_line = false ij_java_class_annotation_wrap = split_into_lines ij_java_class_brace_style = end_of_line -ij_java_class_count_to_use_import_on_demand = 99 +ij_java_class_count_to_use_import_on_demand = 10 ij_java_class_names_in_javadoc = 1 ij_java_deconstruction_list_wrap = normal ij_java_do_not_indent_top_level_class_members = false diff --git a/leaves-server/minecraft-patches/features/0134-Fix-block-place-desync-due-to-update-suppression.patch b/leaves-server/minecraft-patches/features/0134-Fix-block-place-desync-due-to-update-suppression.patch index 9bae9e55..751c0bb8 100644 --- a/leaves-server/minecraft-patches/features/0134-Fix-block-place-desync-due-to-update-suppression.patch +++ b/leaves-server/minecraft-patches/features/0134-Fix-block-place-desync-due-to-update-suppression.patch @@ -5,19 +5,19 @@ Subject: [PATCH] Fix block place desync due to update suppression diff --git a/net/minecraft/world/item/ItemStack.java b/net/minecraft/world/item/ItemStack.java -index e59b8d42d602bbdae1071f2a5be1180420c4efb7..1186cad641786aff2ea6f664724a53511aa1440e 100644 +index e59b8d42d602bbdae1071f2a5be1180420c4efb7..5dadbdb4bb4c0d3a2dcc33120ac725bfe3e6f65c 100644 --- a/net/minecraft/world/item/ItemStack.java +++ b/net/minecraft/world/item/ItemStack.java @@ -389,8 +389,12 @@ public final class ItemStack implements DataComponentHolder { } } InteractionResult interactionResult; -+ org.leavesmc.leaves.util.UpdateSuppressionException ue = null; ++ org.leavesmc.leaves.util.UpdateSuppressionException ue = null; // Leaves start - fix block place desync due to update suppression try { interactionResult = item.useOn(context); + } catch (org.leavesmc.leaves.util.UpdateSuppressionException te) { + interactionResult = net.minecraft.world.InteractionResult.SUCCESS.configurePaper(e -> e.placedBlockAt(clickedPos.immutable())); -+ ue = te; ++ ue = te; // Leaves end - fix block place desync due to update suppression } finally { serverLevel.captureBlockStates = false; } diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/.editorconfig b/leaves-server/src/main/java/org/leavesmc/leaves/.editorconfig index 38a42bbb..9e663b78 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/.editorconfig +++ b/leaves-server/src/main/java/org/leavesmc/leaves/.editorconfig @@ -3,5 +3,4 @@ ij_java_if_brace_force = always ij_java_do_while_brace_force = always ij_java_for_brace_force = always ij_java_while_brace_force = always -ij_java_use_fq_class_names = false -ij_java_packages_to_use_import_on_demand = org.leavesmc.leaves.bot.agent.actions.*, org.leavesmc.leaves.bot.agent.configs.*, org.leavesmc.leaves.entity.bot.action.* \ No newline at end of file +ij_java_use_fq_class_names = false \ No newline at end of file diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java index 2a5739b2..9a7ba737 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/BotList.java @@ -36,7 +36,6 @@ import org.leavesmc.leaves.event.bot.BotRemoveEvent; import org.leavesmc.leaves.event.bot.BotSpawnLocationEvent; import org.slf4j.Logger; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Locale; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java index a2d3ede8..70734c9a 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/ServerBot.java @@ -60,7 +60,7 @@ import org.leavesmc.leaves.LeavesLogger; import org.leavesmc.leaves.bot.agent.AbstractBotConfig; import org.leavesmc.leaves.bot.agent.Actions; import org.leavesmc.leaves.bot.agent.Configs; -import org.leavesmc.leaves.bot.agent.actions.*; +import org.leavesmc.leaves.bot.agent.actions.ServerBotAction; import org.leavesmc.leaves.entity.bot.CraftBot; import org.leavesmc.leaves.event.bot.BotActionScheduleEvent; import org.leavesmc.leaves.event.bot.BotCreateEvent; @@ -310,7 +310,7 @@ public class ServerBot extends ServerPlayer { } @Override - public void setServerLevel(ServerLevel level) { + public void setServerLevel(@NotNull ServerLevel level) { BotList.INSTANCE.updateBotLevel(this, level); super.setServerLevel(level); } @@ -475,9 +475,7 @@ public class ServerBot extends ServerPlayer { } public void renderInfo() { - this.getServer().getPlayerList().getPlayers().forEach( - player -> this.sendPlayerInfo(player) - ); + this.getServer().getPlayerList().getPlayers().forEach(this::sendPlayerInfo); } public void renderData() { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java index c2299cf8..8608a262 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/Configs.java @@ -4,7 +4,12 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.configs.*; +import org.leavesmc.leaves.bot.agent.configs.AlwaysSendDataConfig; +import org.leavesmc.leaves.bot.agent.configs.LocatorBarConfig; +import org.leavesmc.leaves.bot.agent.configs.SimulationDistanceConfig; +import org.leavesmc.leaves.bot.agent.configs.SkipSleepConfig; +import org.leavesmc.leaves.bot.agent.configs.SpawnPhantomConfig; +import org.leavesmc.leaves.bot.agent.configs.TickTypeConfig; import java.util.Collection; import java.util.HashMap; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java index 2302b9f3..c4a4a440 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/agent/actions/ServerMountAction.java @@ -3,7 +3,6 @@ package org.leavesmc.leaves.bot.agent.actions; import net.minecraft.world.entity.Entity; import org.bukkit.Location; import org.bukkit.craftbukkit.entity.CraftEntity; -import org.bukkit.craftbukkit.entity.CraftVehicle; import org.bukkit.entity.Vehicle; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.bot.ServerBot; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java b/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java index e3de49fe..ce938659 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/bot/subcommands/BotActionCommand.java @@ -11,7 +11,7 @@ import org.leavesmc.leaves.LeavesConfig; import org.leavesmc.leaves.bot.BotList; import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.Actions; -import org.leavesmc.leaves.bot.agent.actions.*; +import org.leavesmc.leaves.bot.agent.actions.ServerBotAction; import org.leavesmc.leaves.command.LeavesSubcommand; import org.leavesmc.leaves.command.LeavesSuggestionBuilder; import org.leavesmc.leaves.event.bot.BotActionStopEvent; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBot.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBot.java index e055265e..de83f04c 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBot.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBot.java @@ -9,8 +9,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.leavesmc.leaves.bot.BotList; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerBotAction; +import org.leavesmc.leaves.entity.bot.action.BotAction; import org.leavesmc.leaves.entity.bot.actions.CraftBotAction; import org.leavesmc.leaves.event.bot.BotActionStopEvent; import org.leavesmc.leaves.event.bot.BotRemoveEvent; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBotManager.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBotManager.java index f7cd9a18..dcbf2330 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBotManager.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/CraftBotManager.java @@ -9,8 +9,8 @@ import org.leavesmc.leaves.bot.BotCreateState; import org.leavesmc.leaves.bot.BotList; import org.leavesmc.leaves.bot.ServerBot; import org.leavesmc.leaves.bot.agent.Actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerBotAction; +import org.leavesmc.leaves.entity.bot.action.BotAction; import org.leavesmc.leaves.event.bot.BotCreateEvent; import java.util.Collection; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftAttackAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftAttackAction.java index ede72923..cdf4d0d1 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftAttackAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftAttackAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerAttackAction; +import org.leavesmc.leaves.entity.bot.action.AttackAction; public class CraftAttackAction extends CraftTimerBotAction implements AttackAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java index 7f007233..f3fbd60e 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBotAction.java @@ -2,8 +2,8 @@ package org.leavesmc.leaves.entity.bot.actions; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerBotAction; +import org.leavesmc.leaves.entity.bot.action.BotAction; import java.util.UUID; import java.util.function.Consumer; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java index fb2af4da..6abced38 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftBreakBlockAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerBreakBlockAction; +import org.leavesmc.leaves.entity.bot.action.BreakBlockAction; public class CraftBreakBlockAction extends CraftTimerBotAction implements BreakBlockAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java index 81178cfe..656f45d6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftDropAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerDropAction; +import org.leavesmc.leaves.entity.bot.action.DropAction; public class CraftDropAction extends CraftTimerBotAction implements DropAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java index 21f74b85..eee701eb 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftFishAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerFishAction; +import org.leavesmc.leaves.entity.bot.action.FishAction; public class CraftFishAction extends CraftTimerBotAction implements FishAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java index 081386ac..26cc30ff 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftJumpAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerJumpAction; +import org.leavesmc.leaves.entity.bot.action.JumpAction; public class CraftJumpAction extends CraftTimerBotAction implements JumpAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java index 6355ad90..ec7a80c9 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMountAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerMountAction; +import org.leavesmc.leaves.entity.bot.action.MountAction; public class CraftMountAction extends CraftBotAction implements MountAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java index c40cb4ae..5891cca9 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftMoveAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerMoveAction; +import org.leavesmc.leaves.entity.bot.action.MoveAction; public class CraftMoveAction extends CraftBotAction implements MoveAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java index facb48f1..80ded8a4 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftRotationAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerRotationAction; +import org.leavesmc.leaves.entity.bot.action.RotationAction; public class CraftRotationAction extends CraftBotAction implements RotationAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java index 2d291b90..65041585 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSneakAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerSneakAction; +import org.leavesmc.leaves.entity.bot.action.SneakAction; public class CraftSneakAction extends CraftBotAction implements SneakAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwapAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwapAction.java index 3b74963b..455a89a6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwapAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwapAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerSwapAction; +import org.leavesmc.leaves.entity.bot.action.SwapAction; public class CraftSwapAction extends CraftBotAction implements SwapAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java index a770feb6..ab8986a8 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftSwimAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerSwimAction; +import org.leavesmc.leaves.entity.bot.action.SwimAction; public class CraftSwimAction extends CraftBotAction implements SwimAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftTimerBotAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftTimerBotAction.java index fefead60..532c3e37 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftTimerBotAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftTimerBotAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerTimerBotAction; +import org.leavesmc.leaves.entity.bot.action.TimerBotAction; import java.util.function.Function; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java index 4e2d9dba..57991335 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAction.java @@ -2,8 +2,8 @@ package org.leavesmc.leaves.entity.bot.actions; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.bot.ServerBot; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerUseItemAction; +import org.leavesmc.leaves.entity.bot.action.UseItemAction; public class CraftUseItemAction extends CraftTimerBotAction implements UseItemAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java index 1c9a0ff5..1871d9a7 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemAutoAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerUseItemAutoAction; +import org.leavesmc.leaves.entity.bot.action.UseItemAutoAction; public class CraftUseItemAutoAction extends CraftTimerBotAction implements UseItemAutoAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java index 0575be68..e7cef8b6 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOffhandAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerUseItemOffhandAction; +import org.leavesmc.leaves.entity.bot.action.UseItemOffhandAction; public class CraftUseItemOffhandAction extends CraftTimerBotAction implements UseItemOffhandAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java index ca9f39cb..ca23bdfe 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerUseItemOnAction; +import org.leavesmc.leaves.entity.bot.action.UseItemOnAction; public class CraftUseItemOnAction extends CraftTimerBotAction implements UseItemOnAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java index 1a2c15d4..be00d962 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemOnOffhandAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerUseItemOnOffhandAction; +import org.leavesmc.leaves.entity.bot.action.UseItemOnOffhandAction; public class CraftUseItemOnOffhandAction extends CraftTimerBotAction implements UseItemOnOffhandAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java index b018a321..08072726 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerUseItemToAction; +import org.leavesmc.leaves.entity.bot.action.UseItemToAction; public class CraftUseItemToAction extends CraftTimerBotAction implements UseItemToAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java index 89f65bae..38fc40e8 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/entity/bot/actions/CraftUseItemToOffhandAction.java @@ -1,7 +1,7 @@ package org.leavesmc.leaves.entity.bot.actions; -import org.leavesmc.leaves.bot.agent.actions.*; -import org.leavesmc.leaves.entity.bot.action.*; +import org.leavesmc.leaves.bot.agent.actions.ServerUseItemToOffhandAction; +import org.leavesmc.leaves.entity.bot.action.UseItemToOffhandAction; public class CraftUseItemToOffhandAction extends CraftTimerBotAction implements UseItemToOffhandAction { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/CarpetAlternativeBlockPlacement.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/CarpetAlternativeBlockPlacement.java index e5c5bee2..d5d2b45f 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/CarpetAlternativeBlockPlacement.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/CarpetAlternativeBlockPlacement.java @@ -6,16 +6,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.BedBlock; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.ComparatorBlock; -import net.minecraft.world.level.block.DirectionalBlock; -import net.minecraft.world.level.block.DispenserBlock; -import net.minecraft.world.level.block.GlazedTerracottaBlock; -import net.minecraft.world.level.block.ObserverBlock; -import net.minecraft.world.level.block.RepeaterBlock; -import net.minecraft.world.level.block.StairBlock; -import net.minecraft.world.level.block.TrapDoorBlock; +import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.piston.PistonBaseBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java index eab9764e..42d6fb5e 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/jade/JadeProtocol.java @@ -24,18 +24,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.CampfireBlock; -import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity; -import net.minecraft.world.level.block.entity.BeehiveBlockEntity; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BrewingStandBlockEntity; -import net.minecraft.world.level.block.entity.CalibratedSculkSensorBlockEntity; -import net.minecraft.world.level.block.entity.ChiseledBookShelfBlockEntity; -import net.minecraft.world.level.block.entity.CommandBlockEntity; -import net.minecraft.world.level.block.entity.ComparatorBlockEntity; -import net.minecraft.world.level.block.entity.HopperBlockEntity; -import net.minecraft.world.level.block.entity.JukeboxBlockEntity; -import net.minecraft.world.level.block.entity.LecternBlockEntity; -import net.minecraft.world.level.block.entity.TrialSpawnerBlockEntity; +import net.minecraft.world.level.block.entity.*; import org.bukkit.Bukkit; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; @@ -57,18 +46,7 @@ import org.leavesmc.leaves.protocol.jade.provider.IServerDataProvider; import org.leavesmc.leaves.protocol.jade.provider.IServerExtensionProvider; import org.leavesmc.leaves.protocol.jade.provider.ItemStorageExtensionProvider; import org.leavesmc.leaves.protocol.jade.provider.ItemStorageProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.BeehiveProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.BlockNameProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.BrewingStandProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.CampfireProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.ChiseledBookshelfProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.CommandBlockProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.FurnaceProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.HopperLockProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.JukeboxProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.LecternProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.MobSpawnerCooldownProvider; -import org.leavesmc.leaves.protocol.jade.provider.block.RedstoneProvider; +import org.leavesmc.leaves.protocol.jade.provider.block.*; import org.leavesmc.leaves.protocol.jade.provider.entity.AnimalOwnerProvider; import org.leavesmc.leaves.protocol.jade.provider.entity.MobBreedingProvider; import org.leavesmc.leaves.protocol.jade.provider.entity.MobGrowthProvider; diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java index edc91a16..444aadec 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/protocol/rei/REIServerProtocol.java @@ -20,17 +20,7 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.FireworkRocketRecipe; -import net.minecraft.world.item.crafting.MapCloningRecipe; -import net.minecraft.world.item.crafting.RecipeHolder; -import net.minecraft.world.item.crafting.RecipeMap; -import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.item.crafting.ShapedRecipe; -import net.minecraft.world.item.crafting.ShapelessRecipe; -import net.minecraft.world.item.crafting.SmithingTransformRecipe; -import net.minecraft.world.item.crafting.SmithingTrimRecipe; -import net.minecraft.world.item.crafting.TippedArrowRecipe; -import net.minecraft.world.item.crafting.TransmuteRecipe; +import net.minecraft.world.item.crafting.*; import org.bukkit.Bukkit; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; @@ -38,6 +28,7 @@ import org.bukkit.plugin.PluginManager; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.LeavesConfig; +import org.leavesmc.leaves.LeavesLogger; import org.leavesmc.leaves.plugin.MinecraftInternalPlugin; import org.leavesmc.leaves.protocol.core.LeavesProtocol; import org.leavesmc.leaves.protocol.core.ProtocolHandler; @@ -337,17 +328,17 @@ public class REIServerProtocol implements LeavesProtocol { player.sendSystemMessage(Component.translatable(e.getMessage()).withStyle(ChatFormatting.RED)); } catch (Exception e) { player.sendSystemMessage(Component.translatable("error.rei.internal.error", e.getMessage()).withStyle(ChatFormatting.RED)); - e.printStackTrace(); + LeavesLogger.LOGGER.severe("Failed to move items for player " + player.getScoreboardName(), e); } }); } catch (IllegalStateException e) { player.sendSystemMessage(Component.translatable(e.getMessage()).withStyle(ChatFormatting.RED)); } catch (Exception e) { player.sendSystemMessage(Component.translatable("error.rei.internal.error", e.getMessage()).withStyle(ChatFormatting.RED)); - e.printStackTrace(); + LeavesLogger.LOGGER.severe("Failed to move items for player " + player.getScoreboardName(), e); } } catch (Exception e) { - e.printStackTrace(); + LeavesLogger.LOGGER.severe("Failed to move items for player " + player.getScoreboardName(), e); } }; inboundTransform(player, MOVE_ITEMS_NEW_PACKET, buf, consumer); diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java b/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java index ed711d6f..14b04062 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/replay/Recorder.java @@ -50,7 +50,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; @@ -225,7 +224,7 @@ public class Recorder extends Connection { try { replayFile.saveMetaData(metaData); } catch (IOException e) { - e.printStackTrace(); + LOGGER.severe("Error saving metadata", e); } }); } @@ -235,13 +234,8 @@ public class Recorder extends Connection { } private void savePacket(Packet packet, final ConnectionProtocol protocol) { - try { - final long timestamp = getCurrentTimeAndUpdate(); - replayFile.savePacket(timestamp, packet, protocol); - } catch (Exception e) { - LOGGER.severe("Error saving packet"); - e.printStackTrace(); - } + final long timestamp = getCurrentTimeAndUpdate(); + replayFile.savePacket(timestamp, packet, protocol); } public boolean isSaved() { diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/replay/ReplayFile.java b/leaves-server/src/main/java/org/leavesmc/leaves/replay/ReplayFile.java index 7d27c7da..cc07fe66 100644 --- a/leaves-server/src/main/java/org/leavesmc/leaves/replay/ReplayFile.java +++ b/leaves-server/src/main/java/org/leavesmc/leaves/replay/ReplayFile.java @@ -19,16 +19,7 @@ import org.jetbrains.annotations.NotNull; import org.leavesmc.leaves.protocol.core.ProtocolUtils; import org.leavesmc.leaves.util.UUIDSerializer; -import java.io.BufferedOutputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; +import java.io.*; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.List; @@ -121,7 +112,7 @@ public class ReplayFile { } } - public void savePacket(long timestamp, Packet packet, ConnectionProtocol protocol) throws Exception { + public void savePacket(long timestamp, Packet packet, ConnectionProtocol protocol) { byte[] data = getPacketBytes(packet, protocol); saveService.execute(() -> { try { @@ -129,8 +120,7 @@ public class ReplayFile { packetStream.writeInt(data.length); packetStream.write(data); } catch (Exception e) { - LOGGER.severe("Error saving packet"); - e.printStackTrace(); + LOGGER.severe("Error saving packet", e); } }); }