Now comes the grind, 244 errors left

This commit is contained in:
modmuss50 2016-03-13 16:08:30 +00:00
parent 7f920b282f
commit 9a40abbe78
220 changed files with 2053 additions and 2052 deletions

View file

@ -8,6 +8,10 @@ buildscript {
maven { maven {
name = "sonatype" name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/" url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
maven {
name = "modmuss50"
url = "http://maven.modmuss50.me/"
} }
} }
dependencies { dependencies {
@ -80,8 +84,8 @@ if (ENV.BUILD_NUMBER) {
} }
minecraft { minecraft {
version = "1.8.9-11.15.1.1722" version = "1.9-12.16.0.0-1.9"
mappings = 'snapshot_20151230' mappings = "snapshot_20160312
replace "@MODVERSION@", project.version replace "@MODVERSION@", project.version
makeObfSourceJar = false makeObfSourceJar = false
useDepAts = true useDepAts = true

View file

@ -19,7 +19,7 @@ public class BlockFusionCoil extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/";
@Override @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) {
return prefix + "fusion_coil"; return prefix + "fusion_coil";
} }
} }

View file

@ -4,7 +4,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture; import reborncore.common.blocks.IAdvancedRotationTexture;

View file

@ -18,7 +18,7 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase {
@Override @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) {
return prefix + "highlyadvancedmachine"; return prefix + "highlyadvancedmachine";
} }

View file

@ -4,7 +4,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;

View file

@ -4,13 +4,13 @@ import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -33,7 +33,7 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setUnlocalizedName("techreborn.machineCasing"); setUnlocalizedName("techreborn.machineCasing");
setHardness(2F); setHardness(2F);
this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0)); this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
} }
public PropertyInteger METADATA; public PropertyInteger METADATA;
@ -48,10 +48,10 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
return (Integer) state.getValue(METADATA); return (Integer) state.getValue(METADATA);
} }
protected BlockState createBlockState() { protected BlockStateContainer createBlockStateContainer() {
METADATA = PropertyInteger.create("Type", 0, types.length); METADATA = PropertyInteger.create("Type", 0, types.length);
return new BlockState(this, METADATA); return new BlockStateContainer(this, METADATA);
} }
public int getHeatFromState(IBlockState state) { public int getHeatFromState(IBlockState state) {
@ -90,9 +90,9 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
} }
@Override @Override
public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side) { public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess worldIn, BlockPos pos, EnumFacing side) {
Block b = worldIn.getBlockState(pos).getBlock(); Block b = worldIn.getBlockState(pos).getBlock();
return b == (Block) this ? false : super.shouldSideBeRendered(worldIn, pos, side); return b == (Block) this ? false : super.shouldSideBeRendered(blockState, worldIn, pos, side);
} }
public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) { public boolean shouldConnectToBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta) {
@ -100,8 +100,8 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
} }
@Override @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) {
return "techreborn:blocks/machine/casing" + types[getMetaFromState(blockState)] + "_full"; return "techreborn:blocks/machine/casing" + types[getMetaFromState(BlockStateContainer)] + "_full";
} }
@Override @Override

View file

@ -3,7 +3,7 @@ package techreborn.blocks;
import me.modmuss50.jsonDestroyer.api.ITexturedBlock; import me.modmuss50.jsonDestroyer.api.ITexturedBlock;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockState; import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -39,7 +39,7 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
setUnlocalizedName("techreborn.machineFrame"); setUnlocalizedName("techreborn.machineFrame");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHardness(1f); setHardness(1f);
this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0)); this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0));
} }
@Override @Override
@ -57,8 +57,8 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
} }
@Override @Override
public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) { public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) {
return "techreborn:blocks/machine/" + types[getMetaFromState(blockState)] + "_machine_block"; return "techreborn:blocks/machine/" + types[getMetaFromState(BlockStateContainer)] + "_machine_block";
} }
@Override @Override
@ -71,10 +71,10 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
return state.getValue(METADATA); return state.getValue(METADATA);
} }
protected BlockState createBlockState() { protected BlockStateContainer createBlockStateContainer() {
METADATA = PropertyInteger.create("Type", 0, types.length -1); METADATA = PropertyInteger.create("Type", 0, types.length -1);
return new BlockState(this, METADATA); return new BlockStateContainer(this, METADATA);
} }
@Override @Override

Some files were not shown because too many files have changed in this diff Show more