Fix warnings
This commit is contained in:
parent
da399fc916
commit
8de19ff5e7
13 changed files with 20 additions and 37 deletions
|
@ -35,6 +35,7 @@ import net.minecraftforge.common.util.EnumHelper;
|
|||
* This contains some static stuff used in recipes and other things
|
||||
*/
|
||||
//TODO move this out of the api, and make it nicer
|
||||
@SuppressWarnings("deprecation")
|
||||
public class Reference {
|
||||
|
||||
private static final Class<?>[] ARMOR_PARAMETERS = { String.class, int.class, int[].class, int.class, SoundEvent.class, float.class };
|
||||
|
@ -59,8 +60,7 @@ public class Reference {
|
|||
public static String chemicalReactorRecipe = I18n.translateToLocal("techreborn.recipe.chemicalReactor");
|
||||
public static String industrialGrinderRecipe = I18n.translateToLocal("techreborn.recipe.grinder");
|
||||
public static String implosionCompressorRecipe = I18n.translateToLocal("techreborn.recipe.implosioncompressor");
|
||||
public static String industrialElectrolyzerRecipe = I18n
|
||||
.translateToLocal("techreborn.recipe.industrialelectrolyzer");
|
||||
public static String industrialElectrolyzerRecipe = I18n.translateToLocal("techreborn.recipe.industrialelectrolyzer");
|
||||
public static String industrialSawmillRecipe = I18n.translateToLocal("techreborn.recipe.industrialsawmill");
|
||||
public static String latheRecipe = I18n.translateToLocal("techreborn.recipe.lathe");
|
||||
public static String plateCuttingMachineRecipe = I18n.translateToLocal("techreborn.recipe.platecuttingmachine");
|
||||
|
|
|
@ -39,14 +39,14 @@ public class BlockFluidBase extends BlockFluidClassic {
|
|||
|
||||
@Override
|
||||
public boolean canDisplace(IBlockAccess world, BlockPos pos) {
|
||||
if (world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)).isLiquid())
|
||||
if (world.getBlockState(pos).getMaterial().isLiquid())
|
||||
return false;
|
||||
return super.canDisplace(world, pos);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean displaceIfPossible(World world, BlockPos pos) {
|
||||
if (world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)).isLiquid())
|
||||
if (world.getBlockState(pos).getMaterial().isLiquid())
|
||||
return false;
|
||||
return super.displaceIfPossible(world, pos);
|
||||
}
|
||||
|
|
|
@ -26,7 +26,6 @@ package techreborn.blocks.transformers;
|
|||
|
||||
import com.google.common.base.Predicate;
|
||||
import com.google.common.collect.Iterators;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockDynamicLiquid;
|
||||
import net.minecraft.block.BlockStaticLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
|
@ -80,29 +79,25 @@ public abstract class BlockTransformer extends BaseTileBlock {
|
|||
super.onBlockAdded(worldIn, pos, state);
|
||||
this.setDefaultFacing(worldIn, pos, state);
|
||||
}
|
||||
|
||||
|
||||
private void setDefaultFacing(World worldIn, BlockPos pos, IBlockState state) {
|
||||
if (!worldIn.isRemote) {
|
||||
IBlockState sate = worldIn.getBlockState(pos.north());
|
||||
Block block = sate.getBlock();
|
||||
IBlockState state0 = worldIn.getBlockState(pos.north());
|
||||
IBlockState state1 = worldIn.getBlockState(pos.south());
|
||||
Block block1 = state1.getBlock();
|
||||
IBlockState state2 = worldIn.getBlockState(pos.west());
|
||||
Block block2 = state2.getBlock();
|
||||
IBlockState state3 = worldIn.getBlockState(pos.east());
|
||||
Block block3 = state3.getBlock();
|
||||
EnumFacing enumfacing = state.getValue(FACING);
|
||||
|
||||
if (enumfacing == EnumFacing.NORTH && block.isFullBlock(state) && !block1.isFullBlock(state1)) {
|
||||
EnumFacing enumfacing = (EnumFacing) state.getValue(FACING);
|
||||
|
||||
if (enumfacing == EnumFacing.NORTH && state0.isFullBlock() && !state1.isFullBlock()) {
|
||||
enumfacing = EnumFacing.SOUTH;
|
||||
} else if (enumfacing == EnumFacing.SOUTH && block1.isFullBlock(state1) && !block.isFullBlock(state)) {
|
||||
} else if (enumfacing == EnumFacing.SOUTH && state1.isFullBlock() && !state0.isFullBlock()) {
|
||||
enumfacing = EnumFacing.NORTH;
|
||||
} else if (enumfacing == EnumFacing.WEST && block2.isFullBlock(state2) && !block3.isFullBlock(state2)) {
|
||||
} else if (enumfacing == EnumFacing.WEST && state2.isFullBlock() && !state3.isFullBlock()) {
|
||||
enumfacing = EnumFacing.EAST;
|
||||
} else if (enumfacing == EnumFacing.EAST && block3.isFullBlock(state3) && !block2.isFullBlock(state2)) {
|
||||
} else if (enumfacing == EnumFacing.EAST && state3.isFullBlock() && !state2.isFullBlock()) {
|
||||
enumfacing = EnumFacing.WEST;
|
||||
}
|
||||
|
||||
|
||||
worldIn.setBlockState(pos, state.withProperty(FACING, enumfacing), 2);
|
||||
}
|
||||
}
|
||||
|
@ -167,7 +162,6 @@ public abstract class BlockTransformer extends BaseTileBlock {
|
|||
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
boolean active = false;
|
||||
EnumFacing facing = getSideFromint(meta);
|
||||
return this.getDefaultState().withProperty(FACING, facing);
|
||||
}
|
||||
|
|
|
@ -26,18 +26,13 @@ package techreborn.client.gui;
|
|||
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import reborncore.client.multiblock.Multiblock;
|
||||
import reborncore.client.multiblock.MultiblockRenderEvent;
|
||||
import reborncore.client.multiblock.MultiblockSet;
|
||||
import reborncore.common.misc.Location;
|
||||
import techreborn.Core;
|
||||
import techreborn.client.gui.widget.GuiButtonHologram;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.proxies.ClientProxy;
|
||||
|
|
|
@ -30,7 +30,6 @@ import mezz.jei.api.gui.IDrawableAnimated;
|
|||
import mezz.jei.api.gui.IDrawableStatic;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
|
||||
import techreborn.client.gui.GuiImplosionCompressor;
|
||||
import techreborn.client.gui.TRBuilder;
|
||||
import techreborn.compat.jei.BaseRecipeWrapper;
|
||||
|
||||
|
|
|
@ -82,7 +82,7 @@ public class ItemDustsSmall extends ItemTR {
|
|||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
@Override
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
||||
if (!isInCreativeTab(creativeTabs)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -72,7 +72,7 @@ public class ItemGems extends ItemTR {
|
|||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
@Override
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
||||
if (!isInCreativeTab(creativeTabs)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -81,7 +81,7 @@ public class ItemIngots extends ItemTR {
|
|||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
@Override
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
||||
if (!isInCreativeTab(creativeTabs)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -75,7 +75,7 @@ public class ItemNuggets extends ItemTR {
|
|||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
@Override
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
||||
if (!isInCreativeTab(creativeTabs)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@ public class ItemParts extends ItemTR {
|
|||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
@Override
|
||||
public void getSubItems(final CreativeTabs creativeTabs, final NonNullList list) {
|
||||
public void getSubItems(final CreativeTabs creativeTabs, final NonNullList<ItemStack> list) {
|
||||
if (!isInCreativeTab(creativeTabs)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -93,7 +93,7 @@ public class ItemPlates extends ItemTR {
|
|||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
@Override
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
||||
if (!isInCreativeTab(creativeTabs)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@ public class ItemUpgrades extends ItemTR implements IUpgrade {
|
|||
|
||||
// Adds Dusts SubItems To Creative Tab
|
||||
@Override
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList list) {
|
||||
public void getSubItems(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
|
||||
if (!isInCreativeTab(creativeTabs)) {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -25,15 +25,10 @@
|
|||
package techreborn.tiles.generator;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import reborncore.common.registration.RebornRegistry;
|
||||
import reborncore.common.registration.impl.ConfigRegistry;
|
||||
import reborncore.common.util.FluidUtils;
|
||||
import techreborn.api.generator.EFluidGenerator;
|
||||
import techreborn.blocks.generator.BlockThermalGenerator;
|
||||
import techreborn.client.container.IContainerProvider;
|
||||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
|
|
Loading…
Add table
Reference in a new issue