From 4f1593771e7bb01acc33bd47e4653b2f865b2e22 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 15 Jul 2019 10:59:08 +0300 Subject: [PATCH] Fixed imports --- src/main/java/techreborn/blocks/BlockAlarm.java | 1 - src/main/java/techreborn/blocks/BlockNuke.java | 1 - src/main/java/techreborn/blocks/BlockRubberLog.java | 4 ---- .../java/techreborn/blocks/BlockRubberPlankSlab.java | 1 - .../java/techreborn/blocks/lighting/BlockLamp.java | 1 - .../techreborn/blocks/storage/BlockEnergyStorage.java | 1 - .../techreborn/blocks/storage/BlockLSUStorage.java | 2 -- .../blocks/transformers/BlockTransformer.java | 1 - src/main/java/techreborn/client/GuiHandler.java | 10 ---------- .../techreborn/items/armor/ItemLapotronicOrbpack.java | 4 +--- .../techreborn/items/armor/ItemLithiumIonBatpack.java | 4 ++-- .../items/tool/industrial/ItemIndustrialChainsaw.java | 1 - 12 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index 5eec04d26..7f5e35335 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -129,7 +129,6 @@ public class BlockAlarm extends BaseTileBlock { return null; } - @SuppressWarnings("deprecation") @Override public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); diff --git a/src/main/java/techreborn/blocks/BlockNuke.java b/src/main/java/techreborn/blocks/BlockNuke.java index 1495f0ab0..5b50bcc12 100644 --- a/src/main/java/techreborn/blocks/BlockNuke.java +++ b/src/main/java/techreborn/blocks/BlockNuke.java @@ -92,7 +92,6 @@ public class BlockNuke extends BaseBlock { } } - @SuppressWarnings("deprecation") @Override public void onBlockAdded(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean b) { super.onBlockAdded(state, worldIn, pos, oldState, b); diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index bb076cc94..6161b1dc3 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -37,7 +37,6 @@ import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.Properties; import net.minecraft.tag.BlockTags; import net.minecraft.tag.Tag; -import net.minecraft.util.DefaultedList; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; @@ -56,7 +55,6 @@ import techreborn.items.tool.ItemTreeTap; import techreborn.items.tool.basic.ItemElectricTreetap; import java.util.Random; -import java.util.function.Consumer; /** * Created by modmuss50 on 19/02/2016. @@ -99,7 +97,6 @@ public class BlockRubberLog extends LogBlock { } } - @SuppressWarnings("deprecation") @Override public void onScheduledTick(BlockState state, World worldIn, BlockPos pos, Random random) { super.onScheduledTick(state, worldIn, pos, random); @@ -118,7 +115,6 @@ public class BlockRubberLog extends LogBlock { } } - @SuppressWarnings("deprecation") @Override public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) { diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java index c196dff6d..479e161fe 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java @@ -25,7 +25,6 @@ package techreborn.blocks; import net.fabricmc.fabric.api.block.FabricBlockSettings; -import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.block.SlabBlock; diff --git a/src/main/java/techreborn/blocks/lighting/BlockLamp.java b/src/main/java/techreborn/blocks/lighting/BlockLamp.java index 980d94e32..b2c51f4d8 100644 --- a/src/main/java/techreborn/blocks/lighting/BlockLamp.java +++ b/src/main/java/techreborn/blocks/lighting/BlockLamp.java @@ -143,7 +143,6 @@ public class BlockLamp extends BaseTileBlock { return BlockRenderLayer.CUTOUT; } - @SuppressWarnings("deprecation") @Override public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index a5b639b8b..d0aa1c84b 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -102,7 +102,6 @@ public abstract class BlockEnergyStorage extends BaseTileBlock { builder.add(FACING); } - @SuppressWarnings("deprecation") @Override public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index 228f9031d..81e599d30 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -25,7 +25,6 @@ package techreborn.blocks.storage; import net.fabricmc.fabric.api.block.FabricBlockSettings; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.block.entity.BlockEntity; @@ -92,7 +91,6 @@ public class BlockLSUStorage extends BaseTileBlock { } // Block - @SuppressWarnings("deprecation") @Override public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index df3b06f49..349753047 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -92,7 +92,6 @@ public abstract class BlockTransformer extends BaseTileBlock { builder.add(FACING); } - @SuppressWarnings("deprecation") @Override public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) { ItemStack stack = playerIn.getStackInHand(Hand.MAIN_HAND); diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index edbd54531..22a639612 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -25,18 +25,11 @@ package techreborn.client; import net.fabricmc.fabric.api.client.screen.ScreenProviderRegistry; -import net.fabricmc.fabric.api.container.ContainerFactory; import net.fabricmc.fabric.api.container.ContainerProviderRegistry; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.client.gui.screen.ContainerScreenRegistry; -import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; -import net.minecraft.container.Container; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Identifier; -import net.minecraft.util.PacketByteBuf; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.mixin.extensions.ContainerExtensions; @@ -67,9 +60,6 @@ import techreborn.tiles.storage.TileMediumVoltageSU; import techreborn.tiles.storage.idsu.TileInterdimensionalSU; import techreborn.tiles.storage.lesu.TileLapotronicSU; -import java.util.Arrays; -import java.util.function.Consumer; - public class GuiHandler { public static void register(){ diff --git a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java index 74e4dd53a..da3c89505 100644 --- a/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java +++ b/src/main/java/techreborn/items/armor/ItemLapotronicOrbpack.java @@ -24,8 +24,6 @@ package techreborn.items.armor; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.entity.Entity; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.player.PlayerEntity; @@ -68,7 +66,7 @@ public class ItemLapotronicOrbpack extends ArmorItem implements IEnergyItemInfo, @Override public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { if (entityIn instanceof PlayerEntity) { - ItemLithiumIonBatpack.EnvTypeributePowerToInventory(worldIn, (PlayerEntity) entityIn, stack, + ItemLithiumIonBatpack.distributePowerToInventory(worldIn, (PlayerEntity) entityIn, stack, (int) transferLimit); } } diff --git a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java index 9db78f8ef..d7119261b 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java @@ -52,7 +52,7 @@ public class ItemLithiumIonBatpack extends ArmorItem implements IEnergyItemInfo, super(ArmorMaterials.DIAMOND, EquipmentSlot.CHEST, new Item.Settings().group(TechReborn.ITEMGROUP).maxCount(1)); } - public static void EnvTypeributePowerToInventory(World world, PlayerEntity player, ItemStack itemStack, int maxSend) { + public static void distributePowerToInventory(World world, PlayerEntity player, ItemStack itemStack, int maxSend) { if (world.isClient) { return; } @@ -71,7 +71,7 @@ public class ItemLithiumIonBatpack extends ArmorItem implements IEnergyItemInfo, @Override public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { if (entityIn instanceof PlayerEntity) { - EnvTypeributePowerToInventory(worldIn, (PlayerEntity) entityIn, stack, (int) transferLimit); + distributePowerToInventory(worldIn, (PlayerEntity) entityIn, stack, (int) transferLimit); } } diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java index f13c956fd..6ca5f8af8 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialChainsaw.java @@ -30,7 +30,6 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.item.TooltipContext; import net.minecraft.client.resource.language.I18n; -import net.minecraft.entity.ItemEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemGroup;