From 003debbdcf7368011caa6214182965670bae3a98 Mon Sep 17 00:00:00 2001 From: Petteri <26197131+PetteriM1@users.noreply.github.com> Date: Tue, 26 Mar 2024 22:12:41 +0200 Subject: [PATCH] . --- src/main/java/cn/nukkit/Nukkit.java | 8 ++------ src/main/java/cn/nukkit/block/Block.java | 2 +- src/main/java/cn/nukkit/block/BlockAnvil.java | 2 +- src/main/java/cn/nukkit/block/BlockBlastFurnaceLit.java | 2 +- src/main/java/cn/nukkit/block/BlockBone.java | 2 +- src/main/java/cn/nukkit/block/BlockChest.java | 2 +- src/main/java/cn/nukkit/block/BlockDoor.java | 2 +- src/main/java/cn/nukkit/block/BlockEndPortalFrame.java | 2 +- src/main/java/cn/nukkit/block/BlockEndRod.java | 2 +- src/main/java/cn/nukkit/block/BlockEnderChest.java | 2 +- src/main/java/cn/nukkit/block/BlockFurnaceBurning.java | 2 +- src/main/java/cn/nukkit/block/BlockLadder.java | 2 +- src/main/java/cn/nukkit/block/BlockLightningRod.java | 2 +- src/main/java/cn/nukkit/block/BlockSmokerLit.java | 2 +- src/main/java/cn/nukkit/block/BlockStonecutterBlock.java | 2 +- src/main/java/cn/nukkit/block/BlockTerracottaGlazed.java | 2 +- src/main/java/cn/nukkit/block/BlockTrapdoor.java | 2 +- src/main/java/cn/nukkit/block/BlockTrappedChest.java | 2 +- src/main/java/cn/nukkit/block/BlockWallSign.java | 2 +- 19 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/main/java/cn/nukkit/Nukkit.java b/src/main/java/cn/nukkit/Nukkit.java index 8485c56426b..c2657300084 100644 --- a/src/main/java/cn/nukkit/Nukkit.java +++ b/src/main/java/cn/nukkit/Nukkit.java @@ -73,7 +73,6 @@ public static void main(String[] args) { OptionSpec vSpec = parser.accepts("v", "Set verbosity of logging").withRequiredArg().ofType(String.class); OptionSpec verbositySpec = parser.accepts("verbosity", "Set verbosity of logging").withRequiredArg().ofType(String.class); OptionSpec languageSpec = parser.accepts("language", "Set a predefined language").withOptionalArg().ofType(String.class); - OptionSpec nettyDebugSpec = parser.accepts("debug", "Enables debug stuff"); // Parse arguments OptionSet options = parser.parse(args); @@ -87,11 +86,8 @@ public static void main(String[] args) { return; } - // Netty logger for debug info - if (options.has(nettyDebugSpec)) { - InternalLoggerFactory.setDefaultFactory(Log4J2LoggerFactory.INSTANCE); - ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.PARANOID); - } + InternalLoggerFactory.setDefaultFactory(Log4J2LoggerFactory.INSTANCE); + ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.PARANOID); TITLE = options.has(titleSpec); diff --git a/src/main/java/cn/nukkit/block/Block.java b/src/main/java/cn/nukkit/block/Block.java index a687d2ded7a..bf86e788d0e 100644 --- a/src/main/java/cn/nukkit/block/Block.java +++ b/src/main/java/cn/nukkit/block/Block.java @@ -60,7 +60,7 @@ public abstract class Block extends Position implements Metadatable, Cloneable, /** * A commonly used block face pattern */ - protected static final int[] faces2534 = {2, 5, 3, 4}; + protected static final int[] FACES2534 = {2, 5, 3, 4}; protected Block() {} diff --git a/src/main/java/cn/nukkit/block/BlockAnvil.java b/src/main/java/cn/nukkit/block/BlockAnvil.java index 457cbf70241..ad5a354dea6 100644 --- a/src/main/java/cn/nukkit/block/BlockAnvil.java +++ b/src/main/java/cn/nukkit/block/BlockAnvil.java @@ -15,7 +15,7 @@ */ public class BlockAnvil extends BlockFallableMeta implements Faceable { - private static final int[] faces = {1, 2, 3, 0}; + private static final int[] FACES = {1, 2, 3, 0}; private static final String[] NAMES = { "Anvil", diff --git a/src/main/java/cn/nukkit/block/BlockBlastFurnaceLit.java b/src/main/java/cn/nukkit/block/BlockBlastFurnaceLit.java index cf097f3d4b3..56d7373ead6 100644 --- a/src/main/java/cn/nukkit/block/BlockBlastFurnaceLit.java +++ b/src/main/java/cn/nukkit/block/BlockBlastFurnaceLit.java @@ -40,7 +40,7 @@ public Item toItem() { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); this.getLevel().setBlock(block, this, true, true); CompoundTag nbt = new CompoundTag() .putList(new ListTag<>("Items")) diff --git a/src/main/java/cn/nukkit/block/BlockBone.java b/src/main/java/cn/nukkit/block/BlockBone.java index b8ee934f677..4811adacf73 100644 --- a/src/main/java/cn/nukkit/block/BlockBone.java +++ b/src/main/java/cn/nukkit/block/BlockBone.java @@ -13,7 +13,7 @@ */ public class BlockBone extends BlockSolid implements Faceable { - private static final int[] faces = { + private static final int[] FACES = { 0, 0, 0b1000, diff --git a/src/main/java/cn/nukkit/block/BlockChest.java b/src/main/java/cn/nukkit/block/BlockChest.java index 0e32cdf1f2d..db706d03db1 100644 --- a/src/main/java/cn/nukkit/block/BlockChest.java +++ b/src/main/java/cn/nukkit/block/BlockChest.java @@ -89,7 +89,7 @@ public double getMaxZ() { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { BlockEntityChest chest = null; - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); for (int side = 2; side <= 5; ++side) { if ((this.getDamage() == 4 || this.getDamage() == 5) && (side == 4 || side == 5)) { diff --git a/src/main/java/cn/nukkit/block/BlockDoor.java b/src/main/java/cn/nukkit/block/BlockDoor.java index 08579d94e56..c059ad106e6 100644 --- a/src/main/java/cn/nukkit/block/BlockDoor.java +++ b/src/main/java/cn/nukkit/block/BlockDoor.java @@ -22,7 +22,7 @@ public abstract class BlockDoor extends BlockTransparentMeta implements Faceable public static final int DOOR_HINGE_BIT = 0x01; public static final int DOOR_POWERED_BIT = 0x02; - private static final int[] faces = {1, 2, 3, 0}; + private static final int[] FACES = {1, 2, 3, 0}; protected BlockDoor(int meta) { super(meta); diff --git a/src/main/java/cn/nukkit/block/BlockEndPortalFrame.java b/src/main/java/cn/nukkit/block/BlockEndPortalFrame.java index fc1a33b31d2..3ce0ad0f498 100644 --- a/src/main/java/cn/nukkit/block/BlockEndPortalFrame.java +++ b/src/main/java/cn/nukkit/block/BlockEndPortalFrame.java @@ -13,7 +13,7 @@ */ public class BlockEndPortalFrame extends BlockTransparentMeta implements Faceable { - private static final int[] faces = {2, 3, 0, 1}; + private static final int[] FACES = {2, 3, 0, 1}; public BlockEndPortalFrame() { this(0); diff --git a/src/main/java/cn/nukkit/block/BlockEndRod.java b/src/main/java/cn/nukkit/block/BlockEndRod.java index b4794dfa369..2bb4b1d2fdb 100644 --- a/src/main/java/cn/nukkit/block/BlockEndRod.java +++ b/src/main/java/cn/nukkit/block/BlockEndRod.java @@ -14,7 +14,7 @@ */ public class BlockEndRod extends BlockTransparentMeta implements Faceable { - private static final int[] faces = {0, 1, 3, 2, 5, 4}; + private static final int[] FACES = {0, 1, 3, 2, 5, 4}; public BlockEndRod() { this(0); diff --git a/src/main/java/cn/nukkit/block/BlockEnderChest.java b/src/main/java/cn/nukkit/block/BlockEnderChest.java index 158deb864c0..47120263881 100644 --- a/src/main/java/cn/nukkit/block/BlockEnderChest.java +++ b/src/main/java/cn/nukkit/block/BlockEnderChest.java @@ -92,7 +92,7 @@ public double getMaxZ() { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); this.getLevel().setBlock(this, this, true, true); diff --git a/src/main/java/cn/nukkit/block/BlockFurnaceBurning.java b/src/main/java/cn/nukkit/block/BlockFurnaceBurning.java index 048dfbfd712..0cecc9f2ce8 100644 --- a/src/main/java/cn/nukkit/block/BlockFurnaceBurning.java +++ b/src/main/java/cn/nukkit/block/BlockFurnaceBurning.java @@ -66,7 +66,7 @@ public int getLightLevel() { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); this.getLevel().setBlock(block, this, true, true); CompoundTag nbt = new CompoundTag() .putList(new ListTag<>("Items")) diff --git a/src/main/java/cn/nukkit/block/BlockLadder.java b/src/main/java/cn/nukkit/block/BlockLadder.java index 7906b886c4d..e1dea0dcfa9 100644 --- a/src/main/java/cn/nukkit/block/BlockLadder.java +++ b/src/main/java/cn/nukkit/block/BlockLadder.java @@ -15,7 +15,7 @@ */ public class BlockLadder extends BlockTransparentMeta implements Faceable { - private static final int[] faces = { + private static final int[] FACES = { 0, //never use 1, //never use 3, diff --git a/src/main/java/cn/nukkit/block/BlockLightningRod.java b/src/main/java/cn/nukkit/block/BlockLightningRod.java index b7de521c04d..0d2d86a8da4 100644 --- a/src/main/java/cn/nukkit/block/BlockLightningRod.java +++ b/src/main/java/cn/nukkit/block/BlockLightningRod.java @@ -7,7 +7,7 @@ public class BlockLightningRod extends BlockTransparentMeta { - private static final int[] faces = {0, 1, 2, 3, 4, 5}; + private static final int[] FACES = {0, 1, 2, 3, 4, 5}; public BlockLightningRod() { this(0); diff --git a/src/main/java/cn/nukkit/block/BlockSmokerLit.java b/src/main/java/cn/nukkit/block/BlockSmokerLit.java index 332162d2b16..aad7f8d08bc 100644 --- a/src/main/java/cn/nukkit/block/BlockSmokerLit.java +++ b/src/main/java/cn/nukkit/block/BlockSmokerLit.java @@ -40,7 +40,7 @@ public Item toItem() { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); this.getLevel().setBlock(block, this, true, true); CompoundTag nbt = new CompoundTag() .putList(new ListTag<>("Items")) diff --git a/src/main/java/cn/nukkit/block/BlockStonecutterBlock.java b/src/main/java/cn/nukkit/block/BlockStonecutterBlock.java index c36868440ce..479b1d4fd0c 100644 --- a/src/main/java/cn/nukkit/block/BlockStonecutterBlock.java +++ b/src/main/java/cn/nukkit/block/BlockStonecutterBlock.java @@ -53,7 +53,7 @@ public double getMaxY() { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); return super.place(item, block, target, face, fx, fy, fz, player); } diff --git a/src/main/java/cn/nukkit/block/BlockTerracottaGlazed.java b/src/main/java/cn/nukkit/block/BlockTerracottaGlazed.java index 65e22f1f337..381ed798412 100644 --- a/src/main/java/cn/nukkit/block/BlockTerracottaGlazed.java +++ b/src/main/java/cn/nukkit/block/BlockTerracottaGlazed.java @@ -43,7 +43,7 @@ public Item[] getDrops(Item item) { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); return this.getLevel().setBlock(block, this, true, true); } diff --git a/src/main/java/cn/nukkit/block/BlockTrapdoor.java b/src/main/java/cn/nukkit/block/BlockTrapdoor.java index a96e7f944ba..1c75b219a12 100644 --- a/src/main/java/cn/nukkit/block/BlockTrapdoor.java +++ b/src/main/java/cn/nukkit/block/BlockTrapdoor.java @@ -22,7 +22,7 @@ public class BlockTrapdoor extends BlockTransparentMeta implements Faceable { public static final int TRAPDOOR_OPEN_BIT = 0x08; public static final int TRAPDOOR_TOP_BIT = 0x04; - private static final int[] faces = {2, 1, 3, 0}; + private static final int[] FACES = {2, 1, 3, 0}; public BlockTrapdoor() { this(0); diff --git a/src/main/java/cn/nukkit/block/BlockTrappedChest.java b/src/main/java/cn/nukkit/block/BlockTrappedChest.java index aba41a49f0f..88ea7931980 100644 --- a/src/main/java/cn/nukkit/block/BlockTrappedChest.java +++ b/src/main/java/cn/nukkit/block/BlockTrappedChest.java @@ -35,7 +35,7 @@ public String getName() { @Override public boolean place(Item item, Block block, Block target, BlockFace face, double fx, double fy, double fz, Player player) { BlockEntityChest chest = null; - this.setDamage(Block.faces2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); + this.setDamage(Block.FACES2534[player != null ? player.getDirection().getHorizontalIndex() : 0]); for (BlockFace side : Plane.HORIZONTAL) { if ((this.getDamage() == 4 || this.getDamage() == 5) && (side == BlockFace.WEST || side == BlockFace.EAST)) { diff --git a/src/main/java/cn/nukkit/block/BlockWallSign.java b/src/main/java/cn/nukkit/block/BlockWallSign.java index 695352b0b60..a43c3c8c8ab 100644 --- a/src/main/java/cn/nukkit/block/BlockWallSign.java +++ b/src/main/java/cn/nukkit/block/BlockWallSign.java @@ -9,7 +9,7 @@ */ public class BlockWallSign extends BlockSignPost { - private static final int[] faces = { + private static final int[] FACES = { 3, 2, 5,