Begin 1.11 (compiles, does not run yet)

This commit is contained in:
mezz committed 2017-02-08 00:52:37 -08:00
1 parent 5310003659
commit 424fdaaf48
164 files changed
+1396 -1312

No files matched your search

@@ -17,8 +17,8 @@ import forestry.api.core.ISpriteRegister;
import forestry.api.core.IStateMapperRegister;
import forestry.api.core.ITextureManager;
import forestry.core.blocks.IColoredBlock;
import forestry.core.blocks.propertys.UnlistedBlockAccess;
import forestry.core.blocks.propertys.UnlistedBlockPos;
import forestry.core.blocks.properties.UnlistedBlockAccess;
import forestry.core.blocks.properties.UnlistedBlockPos;
import forestry.core.models.BlockModelEntry;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
@@ -34,6 +34,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
@@ -90,7 +91,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
public abstract ItemStack getCreativeStack(final IDesign p0);
@Override
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
public void getSubBlocks(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> itemList) {
for (final IDesign design : CarpentryManager.carpentryInterface.getSortedDesigns()) {
itemList.add(this.getCreativeStack(design));
}
@@ -113,7 +114,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
}
@Override
public boolean canRenderInLayer(BlockRenderLayer layer) {
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) {
return layer == BlockRenderLayer.CUTOUT_MIPPED;
}