Fixed warnings

This commit is contained in:
drcrazy 2019-02-25 11:43:43 +03:00
parent 4d32e6e292
commit 3314ba33b5
8 changed files with 63 additions and 80 deletions

View file

@ -30,14 +30,12 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.registry.VillagerRegistry; import net.minecraftforge.fml.common.registry.VillagerRegistry;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import reborncore.RebornCore;
import reborncore.api.recipe.RecipeHandler; import reborncore.api.recipe.RecipeHandler;
import reborncore.common.multiblock.MultiblockEventHandler; import reborncore.common.multiblock.MultiblockEventHandler;
import reborncore.common.multiblock.MultiblockServerTickHandler; import reborncore.common.multiblock.MultiblockServerTickHandler;

View file

@ -94,8 +94,8 @@ public class BlockRubberLog extends Block {
for (BlockPos blockpos : BlockPos.getAllInBox(pos.add(-i, -i, -i), pos.add(i, i, i))) { for (BlockPos blockpos : BlockPos.getAllInBox(pos.add(-i, -i, -i), pos.add(i, i, i))) {
IBlockState state1 = worldIn.getBlockState(blockpos); IBlockState state1 = worldIn.getBlockState(blockpos);
if (state1.getBlock() instanceof BlockLeaves) { if (state1.getBlock() instanceof BlockLeaves) {
state1.getBlock().tick(state1, worldIn, pos, worldIn.getRandom()); state1.tick(worldIn, pos, worldIn.getRandom());
state1.getBlock().randomTick(state1, worldIn, pos, worldIn.getRandom()); state1.randomTick(worldIn, pos, worldIn.getRandom());
} }
} }
} }
@ -103,7 +103,7 @@ public class BlockRubberLog extends Block {
@Override @Override
public void tick(IBlockState state, World worldIn, BlockPos pos, Random random) { public void tick(IBlockState state, World worldIn, BlockPos pos, Random random) {
super.tick(state, worldIn, pos, random); state.tick(worldIn, pos, random);
if (!state.get(HAS_SAP)) { if (!state.get(HAS_SAP)) {
if (random.nextInt(50) == 0) { if (random.nextInt(50) == 0) {
EnumFacing facing = EnumFacing.byHorizontalIndex(random.nextInt(4)); EnumFacing facing = EnumFacing.byHorizontalIndex(random.nextInt(4));
@ -118,7 +118,7 @@ public class BlockRubberLog extends Block {
@Override @Override
public boolean onBlockActivated(IBlockState state, World worldIn, BlockPos pos, EntityPlayer playerIn, public boolean onBlockActivated(IBlockState state, World worldIn, BlockPos pos, EntityPlayer playerIn,
EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
super.onBlockActivated(state, worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ); state.onBlockActivated(worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ);
ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND); ItemStack stack = playerIn.getHeldItem(EnumHand.MAIN_HAND);
if (stack.isEmpty()) { if (stack.isEmpty()) {
return false; return false;

View file

@ -41,7 +41,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader; import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorld; import net.minecraft.world.IWorld;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.BlockStateContainer;
import reborncore.api.ToolManager; import reborncore.api.ToolManager;
import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.blocks.BlockWrenchEventHandler;
import reborncore.common.registration.RebornRegister; import reborncore.common.registration.RebornRegister;
@ -140,7 +139,7 @@ public class BlockCable extends BlockContainer {
return true; return true;
} }
} }
return super.onBlockActivated(state, worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ); return state.onBlockActivated(worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ);
} }
@Override @Override

View file

@ -25,7 +25,6 @@
package techreborn.client; package techreborn.client;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
@ -66,9 +65,6 @@ import techreborn.tiles.storage.TileMediumVoltageSU;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
import techreborn.client.gui.*; import techreborn.client.gui.*;
import techreborn.tiles.storage.idsu.TileInterdimensionalSU; import techreborn.tiles.storage.idsu.TileInterdimensionalSU;
import techreborn.tiles.storage.lesu.TileLapotronicSU; import techreborn.tiles.storage.lesu.TileLapotronicSU;

View file

@ -52,7 +52,6 @@ import techreborn.items.tool.vanilla.ItemTRSword;
import techreborn.utils.InitUtils; import techreborn.utils.InitUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.function.Consumer;
/** /**
* @author drcrazy * @author drcrazy

View file

@ -24,14 +24,9 @@
package techreborn.init; package techreborn.init;
import com.mojang.datafixers.DataFixUtils;
import com.mojang.datafixers.types.Type;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType; import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.datafix.DataFixesManager;
import net.minecraft.util.datafix.TypeReferences;
import net.minecraft.util.registry.IRegistry;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import techreborn.tiles.*; import techreborn.tiles.*;
import techreborn.tiles.cable.TileCable; import techreborn.tiles.cable.TileCable;
@ -61,68 +56,67 @@ import techreborn.tiles.transformers.TileMVTransformer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Supplier;
public class TRTileEntities { public class TRTileEntities {
public static final TileEntityType THERMAL_GEN = register(TileThermalGenerator.class, "thermal_generator"); public static final TileEntityType<TileThermalGenerator> THERMAL_GEN = register(TileThermalGenerator.class, "thermal_generator");
public static final TileEntityType QUANTUM_TANK = register(TileQuantumTank.class, "quantum_tank"); public static final TileEntityType<TileQuantumTank> QUANTUM_TANK = register(TileQuantumTank.class, "quantum_tank");
public static final TileEntityType QUANTUM_CHEST = register(TileQuantumChest.class, "quantum_chest"); public static final TileEntityType<TileQuantumChest> QUANTUM_CHEST = register(TileQuantumChest.class, "quantum_chest");
public static final TileEntityType DIGITAL_CHEST = register(TileDigitalChest.class, "digital_chest"); public static final TileEntityType<TileDigitalChest> DIGITAL_CHEST = register(TileDigitalChest.class, "digital_chest");
public static final TileEntityType INDUSTRIAL_CENTRIFUGE = register(TileIndustrialCentrifuge.class, "industrial_centrifuge"); public static final TileEntityType<TileIndustrialCentrifuge> INDUSTRIAL_CENTRIFUGE = register(TileIndustrialCentrifuge.class, "industrial_centrifuge");
public static final TileEntityType ROLLING_MACHINE = register(TileRollingMachine.class, "rolling_machine"); public static final TileEntityType<TileRollingMachine> ROLLING_MACHINE = register(TileRollingMachine.class, "rolling_machine");
public static final TileEntityType INDUSTRIAL_BLAST_FURNACE = register(TileIndustrialBlastFurnace.class, "industrial_blast_furnace"); public static final TileEntityType<TileIndustrialBlastFurnace> INDUSTRIAL_BLAST_FURNACE = register(TileIndustrialBlastFurnace.class, "industrial_blast_furnace");
public static final TileEntityType ALLOY_SMELTER = register(TileAlloySmelter.class, "alloy_smelter"); public static final TileEntityType<TileAlloySmelter> ALLOY_SMELTER = register(TileAlloySmelter.class, "alloy_smelter");
public static final TileEntityType INDUSTRIAL_GRINDER = register(TileIndustrialGrinder.class, "industrial_grinder"); public static final TileEntityType<TileIndustrialGrinder> INDUSTRIAL_GRINDER = register(TileIndustrialGrinder.class, "industrial_grinder");
public static final TileEntityType IMPLOSION_COMPRESSOR = register(TileImplosionCompressor.class, "implosion_compressor"); public static final TileEntityType<TileImplosionCompressor> IMPLOSION_COMPRESSOR = register(TileImplosionCompressor.class, "implosion_compressor");
public static final TileEntityType MATTER_FABRICATOR = register(TileMatterFabricator.class, "matter_fabricator"); public static final TileEntityType<TileMatterFabricator> MATTER_FABRICATOR = register(TileMatterFabricator.class, "matter_fabricator");
public static final TileEntityType CHUNK_LOADER = register(TileChunkLoader.class, "chunk_loader"); public static final TileEntityType<TileChunkLoader> CHUNK_LOADER = register(TileChunkLoader.class, "chunk_loader");
public static final TileEntityType CHARGE_O_MAT = register(TileChargeOMat.class, "charge_o_mat"); public static final TileEntityType<TileChargeOMat> CHARGE_O_MAT = register(TileChargeOMat.class, "charge_o_mat");
public static final TileEntityType PLAYER_DETECTOR = register(TilePlayerDectector.class, "player_detector"); public static final TileEntityType<TilePlayerDectector> PLAYER_DETECTOR = register(TilePlayerDectector.class, "player_detector");
public static final TileEntityType CABLE = register(TileCable.class, "cable"); public static final TileEntityType<TileCable> CABLE = register(TileCable.class, "cable");
public static final TileEntityType MACHINE_CASINGS = register(TileMachineCasing.class, "machine_casing"); public static final TileEntityType<TileMachineCasing> MACHINE_CASINGS = register(TileMachineCasing.class, "machine_casing");
public static final TileEntityType DRAGON_EGG_SYPHON = register(TileDragonEggSyphon.class, "dragon_egg_syphon"); public static final TileEntityType<TileDragonEggSyphon> DRAGON_EGG_SYPHON = register(TileDragonEggSyphon.class, "dragon_egg_syphon");
public static final TileEntityType ASSEMBLY_MACHINE = register(TileAssemblingMachine.class, "assembly_machine"); public static final TileEntityType<TileAssemblingMachine> ASSEMBLY_MACHINE = register(TileAssemblingMachine.class, "assembly_machine");
public static final TileEntityType DIESEL_GENERATOR = register(TileDieselGenerator.class, "diesel_generator"); public static final TileEntityType<TileDieselGenerator> DIESEL_GENERATOR = register(TileDieselGenerator.class, "diesel_generator");
public static final TileEntityType INDUSTRIAL_ELECTROLYZER = register(TileIndustrialElectrolyzer.class, "industrial_electrolyzer"); public static final TileEntityType<TileIndustrialElectrolyzer> INDUSTRIAL_ELECTROLYZER = register(TileIndustrialElectrolyzer.class, "industrial_electrolyzer");
public static final TileEntityType SEMI_FLUID_GENERATOR = register(TileSemiFluidGenerator.class, "semi_fluid_generator"); public static final TileEntityType<TileSemiFluidGenerator> SEMI_FLUID_GENERATOR = register(TileSemiFluidGenerator.class, "semi_fluid_generator");
public static final TileEntityType GAS_TURBINE = register(TileGasTurbine.class, "gas_turbine"); public static final TileEntityType<TileGasTurbine> GAS_TURBINE = register(TileGasTurbine.class, "gas_turbine");
public static final TileEntityType IRON_ALLOY_FURNACE = register(TileIronAlloyFurnace.class, "iron_alloy_furnace"); public static final TileEntityType<TileIronAlloyFurnace> IRON_ALLOY_FURNACE = register(TileIronAlloyFurnace.class, "iron_alloy_furnace");
public static final TileEntityType CHEMICAL_REACTOR = register(TileChemicalReactor.class, "chemical_reactor"); public static final TileEntityType<TileChemicalReactor> CHEMICAL_REACTOR = register(TileChemicalReactor.class, "chemical_reactor");
public static final TileEntityType INTERDIMENSIONAL_SU = register(TileInterdimensionalSU.class, "interdimensional_su"); public static final TileEntityType<TileInterdimensionalSU> INTERDIMENSIONAL_SU = register(TileInterdimensionalSU.class, "interdimensional_su");
public static final TileEntityType ADJUSTABLE_SU = register(TileAdjustableSU.class, "adjustable_su"); public static final TileEntityType<TileAdjustableSU> ADJUSTABLE_SU = register(TileAdjustableSU.class, "adjustable_su");
public static final TileEntityType LAPOTRONIC_SU = register(TileLapotronicSU.class, "lapotronic_su"); public static final TileEntityType<TileLapotronicSU> LAPOTRONIC_SU = register(TileLapotronicSU.class, "lapotronic_su");
public static final TileEntityType LSU_STORAGE = register(TileLSUStorage.class, "lsu_storage"); public static final TileEntityType<TileLSUStorage> LSU_STORAGE = register(TileLSUStorage.class, "lsu_storage");
public static final TileEntityType DISTILLATION_TOWER = register(TileDistillationTower.class, "distillation_tower"); public static final TileEntityType<TileDistillationTower> DISTILLATION_TOWER = register(TileDistillationTower.class, "distillation_tower");
public static final TileEntityType VACUUM_FREEZER = register(TileVacuumFreezer.class, "vacuum_freezer"); public static final TileEntityType<TileVacuumFreezer> VACUUM_FREEZER = register(TileVacuumFreezer.class, "vacuum_freezer");
public static final TileEntityType FUSION_CONTROL_COMPUTER = register(TileFusionControlComputer.class, "fusion_control_computer"); public static final TileEntityType<TileFusionControlComputer> FUSION_CONTROL_COMPUTER = register(TileFusionControlComputer.class, "fusion_control_computer");
public static final TileEntityType LIGHTNING_ROD = register(TileLightningRod.class, "lightning_rod"); public static final TileEntityType<TileLightningRod> LIGHTNING_ROD = register(TileLightningRod.class, "lightning_rod");
public static final TileEntityType INDUSTRIAL_SAWMILL = register(TileIndustrialSawmill.class, "industrial_sawmill"); public static final TileEntityType<TileIndustrialSawmill> INDUSTRIAL_SAWMILL = register(TileIndustrialSawmill.class, "industrial_sawmill");
public static final TileEntityType GRINDER = register(TileGrinder.class, "grinder"); public static final TileEntityType<TileGrinder> GRINDER = register(TileGrinder.class, "grinder");
public static final TileEntityType SOLID_FUEL_GENEREATOR = register(TileSolidFuelGenerator.class, "solid_fuel_generator"); public static final TileEntityType<TileSolidFuelGenerator> SOLID_FUEL_GENEREATOR = register(TileSolidFuelGenerator.class, "solid_fuel_generator");
public static final TileEntityType EXTRACTOR = register(TileExtractor.class, "extractor"); public static final TileEntityType<TileExtractor> EXTRACTOR = register(TileExtractor.class, "extractor");
public static final TileEntityType COMPRESSOR = register(TileCompressor.class, "compressor"); public static final TileEntityType<TileCompressor> COMPRESSOR = register(TileCompressor.class, "compressor");
public static final TileEntityType ELECTRIC_FURNACE = register(TileElectricFurnace.class, "electric_furnace"); public static final TileEntityType<TileElectricFurnace> ELECTRIC_FURNACE = register(TileElectricFurnace.class, "electric_furnace");
public static final TileEntityType SOLAR_PANEL = register(TileSolarPanel.class, "solar_panel"); public static final TileEntityType<TileSolarPanel> SOLAR_PANEL = register(TileSolarPanel.class, "solar_panel");
public static final TileEntityType CREATIVE_QUANTUM_TANK = register(TileCreativeQuantumTank.class, "creative_quantum_tank"); public static final TileEntityType<TileCreativeQuantumTank> CREATIVE_QUANTUM_TANK = register(TileCreativeQuantumTank.class, "creative_quantum_tank");
public static final TileEntityType CREATIVE_QUANTUM_CHEST = register(TileCreativeQuantumChest.class, "creative_quantum_chest"); public static final TileEntityType<TileCreativeQuantumChest> CREATIVE_QUANTUM_CHEST = register(TileCreativeQuantumChest.class, "creative_quantum_chest");
public static final TileEntityType WATER_MILL = register(TileWaterMill.class, "water_mill"); public static final TileEntityType<TileWaterMill> WATER_MILL = register(TileWaterMill.class, "water_mill");
public static final TileEntityType WIND_MILL = register(TileWindMill.class, "wind_mill"); public static final TileEntityType<TileWindMill> WIND_MILL = register(TileWindMill.class, "wind_mill");
public static final TileEntityType MACHINE_BASE = register(TileMachineBase.class, "machine_base"); public static final TileEntityType<TileMachineBase> MACHINE_BASE = register(TileMachineBase.class, "machine_base");
public static final TileEntityType RECYCLER = register(TileRecycler.class, "recycler"); public static final TileEntityType<TileRecycler> RECYCLER = register(TileRecycler.class, "recycler");
public static final TileEntityType LOW_VOLTAGE_SU = register(TileLowVoltageSU.class, "low_voltage_su"); public static final TileEntityType<TileLowVoltageSU> LOW_VOLTAGE_SU = register(TileLowVoltageSU.class, "low_voltage_su");
public static final TileEntityType MEDIUM_VOLTAGE_SU = register(TileMediumVoltageSU.class, "medium_voltage_su"); public static final TileEntityType<TileMediumVoltageSU> MEDIUM_VOLTAGE_SU = register(TileMediumVoltageSU.class, "medium_voltage_su");
public static final TileEntityType HIGH_VOLTAGE_SU = register(TileHighVoltageSU.class, "high_voltage_su"); public static final TileEntityType<TileHighVoltageSU> HIGH_VOLTAGE_SU = register(TileHighVoltageSU.class, "high_voltage_su");
public static final TileEntityType LV_TRANSFORMER = register(TileLVTransformer.class, "lv_transformer"); public static final TileEntityType<TileLVTransformer> LV_TRANSFORMER = register(TileLVTransformer.class, "lv_transformer");
public static final TileEntityType MV_TRANSFORMER = register(TileMVTransformer.class, "mv_transformer"); public static final TileEntityType<TileMVTransformer> MV_TRANSFORMER = register(TileMVTransformer.class, "mv_transformer");
public static final TileEntityType HV_TRANSFORMER = register(TileHVTransformer.class, "hv_transformer"); public static final TileEntityType<TileHVTransformer> HV_TRANSFORMER = register(TileHVTransformer.class, "hv_transformer");
public static final TileEntityType AUTO_CRAFTING_TABLE = register(TileAutoCraftingTable.class, "auto_crafting_table"); public static final TileEntityType<TileAutoCraftingTable> AUTO_CRAFTING_TABLE = register(TileAutoCraftingTable.class, "auto_crafting_table");
public static final TileEntityType IRON_FURNACE = register(TileIronFurnace.class, "iron_furnace"); public static final TileEntityType<TileIronFurnace> IRON_FURNACE = register(TileIronFurnace.class, "iron_furnace");
public static final TileEntityType SCRAPBOXINATOR = register(TileScrapboxinator.class, "scrapboxinator"); public static final TileEntityType<TileScrapboxinator> SCRAPBOXINATOR = register(TileScrapboxinator.class, "scrapboxinator");
public static final TileEntityType PLASMA_GENERATOR = register(TilePlasmaGenerator.class, "plasma_generator"); public static final TileEntityType<TilePlasmaGenerator> PLASMA_GENERATOR = register(TilePlasmaGenerator.class, "plasma_generator");
public static final TileEntityType LAMP = register(TileLamp.class, "lamp"); public static final TileEntityType<TileLamp> LAMP = register(TileLamp.class, "lamp");
public static final TileEntityType ALARM = register(TileAlarm.class, "alarm"); public static final TileEntityType<TileAlarm> ALARM = register(TileAlarm.class, "alarm");
public static final TileEntityType FLUID_REPLICATOR = register(TileFluidReplicator.class, "fluid_replicator"); public static final TileEntityType<TileFluidReplicator> FLUID_REPLICATOR = register(TileFluidReplicator.class, "fluid_replicator");
public static List<TileEntityType<?>> TYPES = new ArrayList<>(); public static List<TileEntityType<?>> TYPES = new ArrayList<>();

View file

@ -73,7 +73,6 @@ public class ItemFrequencyTransmitter extends Item {
@Override @Override
public EnumActionResult onItemUse(ItemUseContext context) { public EnumActionResult onItemUse(ItemUseContext context) {
EntityPlayer player = context.getPlayer();
World world = context.getWorld(); World world = context.getWorld();
BlockPos pos = context.getPos(); BlockPos pos = context.getPos();
ItemStack stack = context.getItem(); ItemStack stack = context.getItem();

View file

@ -24,7 +24,6 @@
package techreborn.items.tool.basic; package techreborn.items.tool.basic;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -61,7 +60,6 @@ public class ItemElectricTreetap extends Item implements IEnergyItemInfo {
// Item // Item
@Override @Override
public EnumActionResult onItemUse(ItemUseContext context) { public EnumActionResult onItemUse(ItemUseContext context) {
IBlockState state = context.getWorld().getBlockState(context.getPos());
ForgePowerItemManager capEnergy = new ForgePowerItemManager(context.getItem()); ForgePowerItemManager capEnergy = new ForgePowerItemManager(context.getItem());
if(TechRebornAPI.ic2Helper != null && capEnergy.getEnergyStored() >= cost){ if(TechRebornAPI.ic2Helper != null && capEnergy.getEnergyStored() >= cost){
if(TechRebornAPI.ic2Helper.extractSap(context, null) && !context.getWorld().isRemote){ if(TechRebornAPI.ic2Helper.extractSap(context, null) && !context.getWorld().isRemote){