From 2239a8a78393e1bdd5babf5471929e2d21634ad9 Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Wed, 9 Aug 2017 12:20:55 -0400 Subject: [PATCH] More deprecation stuffs 1.13 will remove metadata so expect a few more of these for the remainig getStateFromMeta stuff... Hopefully this doesn't set anything on fire --- .../mod/blocks/BlockLampPowerer.java | 7 +++--- .../mod/blocks/BlockSlabs.java | 22 +++++++++---------- .../mod/blocks/BlockWallAA.java | 2 +- .../mod/blocks/BlockWildPlant.java | 8 +++---- .../mod/blocks/InitBlocks.java | 12 +++++----- .../mod/blocks/base/BlockPlant.java | 5 +++-- .../mod/blocks/base/BlockStair.java | 7 +++--- .../mod/gen/WorldGenLushCaves.java | 2 +- .../mod/items/ItemAllToolAA.java | 4 ++-- .../apiimpl/farmer/CactusFarmerBehavior.java | 6 ++--- 10 files changed, 37 insertions(+), 38 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java index f0236826c..502df151d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLampPowerer.java @@ -71,16 +71,15 @@ public class BlockLampPowerer extends BlockBase{ IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); if(block instanceof BlockColoredLamp){ - boolean isOn = ((BlockColoredLamp)block).isOn; - int meta = block.getMetaFromState(state); + boolean isOn = ((BlockColoredLamp) block).isOn; if(powered){ if(!isOn){ - world.setBlockState(pos, InitBlocks.blockColoredLampOn.getStateFromMeta(meta), 2); + world.setBlockState(pos, InitBlocks.blockColoredLampOn.getDefaultState().withProperty(BlockColoredLamp.TYPE, state.getValue(BlockColoredLamp.TYPE)), 2); } } else{ if(isOn){ - world.setBlockState(pos, InitBlocks.blockColoredLamp.getStateFromMeta(meta), 2); + world.setBlockState(pos, InitBlocks.blockColoredLamp.getDefaultState().withProperty(BlockColoredLamp.TYPE, state.getValue(BlockColoredLamp.TYPE)), 2); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java index 67ef5bac3..508b1db14 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -37,20 +37,18 @@ public class BlockSlabs extends BlockBase{ public static final AxisAlignedBB AABB_BOTTOM_HALF = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D); private static final AxisAlignedBB AABB_TOP_HALF = new AxisAlignedBB(0.0D, 0.5D, 0.0D, 1.0D, 1.0D, 1.0D); - - private final Block fullBlock; - private final int meta; + + private final IBlockState fullBlockState; public BlockSlabs(String name, Block fullBlock){ - this(name, fullBlock, 0); + this(name, fullBlock.getDefaultState()); } - public BlockSlabs(String name, Block fullBlock, int meta){ - super(fullBlock.getDefaultState().getMaterial(), name); + public BlockSlabs(String name, IBlockState fullBlockState){ + super(fullBlockState.getMaterial(), name); this.setHardness(1.5F); this.setResistance(10.0F); - this.fullBlock = fullBlock; - this.meta = meta; + this.fullBlockState = fullBlockState; } /*@Override @@ -140,11 +138,11 @@ public class BlockSlabs extends BlockBase{ if(state.getBlock() == this.block){ BlockSlabs theBlock = (BlockSlabs)this.block; if((facing == EnumFacing.UP && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM) || (facing == EnumFacing.DOWN && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP)){ - IBlockState newState = theBlock.fullBlock.getStateFromMeta(theBlock.meta); + IBlockState newState = theBlock.fullBlockState; AxisAlignedBB bound = newState.getCollisionBoundingBox(world, pos); if(bound != Block.NULL_AABB && world.checkNoEntityCollision(bound.offset(pos)) && world.setBlockState(pos, newState, 11)){ - SoundType soundtype = theBlock.fullBlock.getSoundType(theBlock.fullBlock.getDefaultState(), world, pos, player); + SoundType soundtype = theBlock.fullBlockState.getBlock().getSoundType(theBlock.fullBlockState, world, pos, player); world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume()+1.0F)/2.0F, soundtype.getPitch()*0.8F); player.setHeldItem(hand, StackUtil.addStackSize(stack, -1)); } @@ -179,11 +177,11 @@ public class BlockSlabs extends BlockBase{ if(iblockstate.getBlock() == this.block){ BlockSlabs theBlock = (BlockSlabs)this.block; - IBlockState newState = theBlock.fullBlock.getStateFromMeta(theBlock.meta); + IBlockState newState = theBlock.fullBlockState; AxisAlignedBB bound = newState.getCollisionBoundingBox(world, pos); if(bound != Block.NULL_AABB && world.checkNoEntityCollision(bound.offset(pos)) && world.setBlockState(pos, newState, 11)){ - SoundType soundtype = theBlock.fullBlock.getSoundType(theBlock.fullBlock.getDefaultState(), world, pos, player); + SoundType soundtype = theBlock.fullBlockState.getBlock().getSoundType(theBlock.fullBlockState, world, pos, player); world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume()+1.0F)/2.0F, soundtype.getPitch()*0.8F); player.setHeldItem(hand, StackUtil.addStackSize(stack, -1)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java index 937e135e0..6c9b0f53a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java @@ -130,7 +130,7 @@ public class BlockWallAA extends BlockBase{ public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos){ IBlockState state = worldIn.getBlockState(pos); Block block = state.getBlock(); - return block != Blocks.BARRIER && (!(block != this && !(block instanceof BlockFenceGate)) || ((state.getMaterial().isOpaque() && block.isFullCube(state)) && state.getMaterial() != Material.GOURD)); + return block != Blocks.BARRIER && (!(block != this && !(block instanceof BlockFenceGate)) || ((state.getMaterial().isOpaque() && state.isFullCube()) && state.getMaterial() != Material.GOURD)); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java index 4d2d94e1a..55ced52e1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWildPlant.java @@ -18,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase; import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; +import net.minecraft.block.BlockCrops; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.properties.PropertyEnum; @@ -36,8 +37,6 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.List; - public class BlockWildPlant extends BlockBushBase{ public static final TheWildPlants[] ALL_WILD_PLANTS = TheWildPlants.values(); @@ -73,9 +72,10 @@ public class BlockWildPlant extends BlockBushBase{ } @Override - public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ + public void getDrops(NonNullList drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune){ int metadata = this.getMetaFromState(state); - return metadata >= ALL_WILD_PLANTS.length ? null : ALL_WILD_PLANTS[metadata].wildVersionOf.getDrops(world, pos, ALL_WILD_PLANTS[metadata].wildVersionOf.getStateFromMeta(7), fortune); + if(metadata < ALL_WILD_PLANTS.length) + ALL_WILD_PLANTS[metadata].wildVersionOf.getDrops(drops, world, pos, ALL_WILD_PLANTS[metadata].wildVersionOf.getDefaultState().withProperty(BlockCrops.AGE, 7), fortune); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java index a3301a8b9..b0234b836 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/InitBlocks.java @@ -213,11 +213,11 @@ public final class InitBlocks{ blockQuartzWall = new BlockWallAA("block_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); blockChiseledQuartzWall = new BlockWallAA("block_chiseled_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); blockPillarQuartzWall = new BlockWallAA("block_pillar_quartz_wall", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); - blockQuartzStair = new BlockStair(blockMisc, "block_quartz_stair", TheMiscBlocks.QUARTZ.ordinal()); - blockChiseledQuartzStair = new BlockStair(blockMisc, "block_chiseled_quartz_stair", TheMiscBlocks.QUARTZ_CHISELED.ordinal()); - blockPillarQuartzStair = new BlockStair(blockMisc, "block_pillar_quartz_stair", TheMiscBlocks.QUARTZ_PILLAR.ordinal()); - blockQuartzSlab = new BlockSlabs("block_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ.ordinal()); - blockChiseledQuartzSlab = new BlockSlabs("block_chiseled_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ_CHISELED.ordinal()); - blockPillarQuartzSlab = new BlockSlabs("block_pillar_quartz_slab", blockMisc, TheMiscBlocks.QUARTZ_PILLAR.ordinal()); + blockQuartzStair = new BlockStair(blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ), "block_quartz_stair"); + blockChiseledQuartzStair = new BlockStair(blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_CHISELED), "block_chiseled_quartz_stair"); + blockPillarQuartzStair = new BlockStair(blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_PILLAR), "block_pillar_quartz_stair"); + blockQuartzSlab = new BlockSlabs("block_quartz_slab", blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ)); + blockChiseledQuartzSlab = new BlockSlabs("block_chiseled_quartz_slab", blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_CHISELED)); + blockPillarQuartzSlab = new BlockSlabs("block_pillar_quartz_slab", blockMisc.getDefaultState().withProperty(BlockMisc.TYPE, TheMiscBlocks.QUARTZ_PILLAR)); } } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index be10921a4..e0ba531a9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java @@ -23,12 +23,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; -import java.util.List; import java.util.Random; public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarity, IHasModel{ @@ -93,7 +93,8 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit if(this.getMetaFromState(state) >= 7){ if(!world.isRemote){ - List drops = this.getDrops(world, pos, state, 0); + NonNullList drops = NonNullList.create(); + this.getDrops(drops, world, pos, state, 0); boolean deductedSeedSize = false; for(ItemStack drop : drops){ if(StackUtil.isValid(drop)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index 7394e8812..70921172d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java @@ -16,6 +16,7 @@ import de.ellpeck.actuallyadditions.mod.blocks.render.IHasModel; import de.ellpeck.actuallyadditions.mod.util.ItemUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import net.minecraft.block.state.IBlockState; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -24,11 +25,11 @@ public class BlockStair extends BlockStairs implements ItemBlockBase.ICustomRari private final String name; public BlockStair(Block block, String name){ - this(block, name, 0); + this(block.getDefaultState(), name); } - public BlockStair(Block block, String name, int meta){ - super(block.getStateFromMeta(meta)); + public BlockStair(IBlockState state, String name){ + super(state); this.name = name; this.setLightOpacity(0); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java index 689f96993..6375eafeb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/gen/WorldGenLushCaves.java @@ -89,7 +89,7 @@ public class WorldGenLushCaves{ IBlockState state = world.getBlockState(pos); IBlockState stateSide = world.getBlockState(posSide); - if(state.getBlock().isAir(state, world, pos) && stateSide.getBlock().isSideSolid(stateSide, world, posSide, side.getOpposite())){ + if(state.getBlock().isAir(state, world, pos) && stateSide.isSideSolid(world, posSide, side.getOpposite())){ Block block = CRYSTAL_CLUSTERS[rand.nextInt(CRYSTAL_CLUSTERS.length)]; world.setBlockState(pos, block.getDefaultState().withProperty(BlockDirectional.FACING, side.getOpposite()), 2); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 5ae92a2e2..eb83e5bf7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -44,7 +44,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ super(4.0F, -2F, toolMat, repairItem, unlocalizedName, rarity, new HashSet()); this.color = color; - this.setMaxDamage(this.getMaxDamage()*4); + this.setMaxDamage(toolMat.getMaxUses()*4); this.setHarvestLevels(toolMat.getHarvestLevel()); } @@ -52,7 +52,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem{ super(4.0F, -2F, toolMat, repairItem, unlocalizedName, rarity, new HashSet()); this.color = color; - this.setMaxDamage(this.getMaxDamage()*4); + this.setMaxDamage(toolMat.getMaxUses()*4); this.setHarvestLevels(toolMat.getHarvestLevel()); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java index 12a5e72dc..bea9dfd06 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/apiimpl/farmer/CactusFarmerBehavior.java @@ -19,11 +19,10 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.List; - public class CactusFarmerBehavior implements IFarmerBehavior{ @Override @@ -62,7 +61,8 @@ public class CactusFarmerBehavior implements IFarmerBehavior{ BlockPos up = pos.up(i); IBlockState upState = world.getBlockState(up); if(upState.getBlock() instanceof BlockCactus){ - List drops = upState.getBlock().getDrops(world, up, upState, 0); + NonNullList drops = NonNullList.create(); + upState.getBlock().getDrops(drops, world, up, upState, 0); if(drops != null && !drops.isEmpty()){ if(farmer.addToOutputInventory(drops, false)){