From efad3e64115683e281496b4aa325e2f514f15851 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Tue, 8 Sep 2020 16:00:20 +0300 Subject: [PATCH] Formatting for PlayerDetectorBlock --- .../machine/tier1/PlayerDectectorBlockEntity.java | 6 +++--- ...kPlayerDetector.java => PlayerDetectorBlock.java} | 12 +++++++----- src/main/java/techreborn/init/TRContent.java | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) rename src/main/java/techreborn/blocks/machine/tier1/{BlockPlayerDetector.java => PlayerDetectorBlock.java} (96%) diff --git a/src/main/java/techreborn/blockentity/machine/tier1/PlayerDectectorBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/PlayerDectectorBlockEntity.java index d7581fcd5..4a7c5bfc9 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/PlayerDectectorBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/PlayerDectectorBlockEntity.java @@ -32,8 +32,8 @@ import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.util.WorldUtils; -import techreborn.blocks.machine.tier1.BlockPlayerDetector; -import techreborn.blocks.machine.tier1.BlockPlayerDetector.PlayerDetectorType; +import techreborn.blocks.machine.tier1.PlayerDetectorBlock; +import techreborn.blocks.machine.tier1.PlayerDetectorBlock.PlayerDetectorType; import techreborn.config.TechRebornConfig; import techreborn.init.TRBlockEntities; import techreborn.init.TRContent; @@ -62,7 +62,7 @@ public class PlayerDectectorBlockEntity extends PowerAcceptorBlockEntity impleme if (canUseEnergy(TechRebornConfig.playerDetectorEuPerTick)) { for (PlayerEntity player : world.getPlayers()) { if (player.distanceTo(player) <= 256.0D) { - PlayerDetectorType type = world.getBlockState(pos).get(BlockPlayerDetector.TYPE); + PlayerDetectorType type = world.getBlockState(pos).get(PlayerDetectorBlock.TYPE); if (type == PlayerDetectorType.ALL) {// ALL redstone = true; } else if (type == PlayerDetectorType.OTHERS) {// Others diff --git a/src/main/java/techreborn/blocks/machine/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java similarity index 96% rename from src/main/java/techreborn/blocks/machine/tier1/BlockPlayerDetector.java rename to src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java index eef40dadf..8defc5069 100644 --- a/src/main/java/techreborn/blocks/machine/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/machine/tier1/PlayerDetectorBlock.java @@ -54,11 +54,11 @@ import reborncore.common.util.StringUtils; import techreborn.blockentity.machine.tier1.PlayerDectectorBlockEntity; import techreborn.utils.MessageIDs; -public class BlockPlayerDetector extends BlockMachineBase { +public class PlayerDetectorBlock extends BlockMachineBase { public static EnumProperty TYPE; - public BlockPlayerDetector() { + public PlayerDetectorBlock() { super(Block.Settings.of(Material.METAL).strength(2f, 2f), true); this.setDefaultState(this.getStateManager().getDefaultState().with(TYPE, PlayerDetectorType.ALL)); } @@ -70,8 +70,7 @@ public class BlockPlayerDetector extends BlockMachineBase { } @Override - public void onPlaced(World worldIn, BlockPos pos, BlockState state, LivingEntity placer, - ItemStack stack) { + public void onPlaced(World worldIn, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) { super.onPlaced(worldIn, pos, state, placer, stack); BlockEntity blockEntity = worldIn.getBlockEntity(pos); if (blockEntity instanceof PlayerDectectorBlockEntity) { @@ -142,18 +141,20 @@ public class BlockPlayerDetector extends BlockMachineBase { return null; } - // Block @Override protected void appendProperties(StateManager.Builder builder) { TYPE = EnumProperty.of("type", PlayerDetectorType.class); builder.add(TYPE); } + // AbstractBlock + @SuppressWarnings("deprecation") @Override public boolean emitsRedstonePower(BlockState state) { return true; } + @SuppressWarnings("deprecation") @Override public int getWeakRedstonePower(BlockState blockState, BlockView blockAccess, BlockPos pos, Direction side) { BlockEntity entity = blockAccess.getBlockEntity(pos); @@ -163,6 +164,7 @@ public class BlockPlayerDetector extends BlockMachineBase { return 0; } + @SuppressWarnings("deprecation") @Override public int getStrongRedstonePower(BlockState blockState, BlockView blockAccess, BlockPos pos, Direction side) { BlockEntity entity = blockAccess.getBlockEntity(pos); diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 5557e902d..098d7fb03 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -63,7 +63,7 @@ import techreborn.blocks.generator.GenericGeneratorBlock; import techreborn.blocks.lighting.BlockLamp; import techreborn.blocks.machine.tier0.IronAlloyFurnaceBlock; import techreborn.blocks.machine.tier0.IronFurnaceBlock; -import techreborn.blocks.machine.tier1.BlockPlayerDetector; +import techreborn.blocks.machine.tier1.PlayerDetectorBlock; import techreborn.blocks.machine.tier1.ResinBasinBlock; import techreborn.blocks.misc.*; import techreborn.blocks.storage.energy.*; @@ -560,7 +560,7 @@ public class TRContent { CHUNK_LOADER(new GenericMachineBlock(GuiType.CHUNK_LOADER, ChunkLoaderBlockEntity::new)), LAMP_INCANDESCENT(new BlockLamp(4, 10, 8)), LAMP_LED(new BlockLamp(1, 1, 12)), - PLAYER_DETECTOR(new BlockPlayerDetector()); + PLAYER_DETECTOR(new PlayerDetectorBlock()); public final String name; public final Block block;