Commit ebd433c4 authored by primetoxinz's avatar primetoxinz

Update to mcp stable 39

parent 94789690
......@@ -28,7 +28,7 @@ if (System.getenv().BUILD_NUMBER != null) {//adds the build number to the end of
minecraft {
version = "1.12.2-14.23.4.2727"
runDir = "run"
mappings = "snapshot_20171125"
mappings = "stable_39"
replace "%VERSION%": "${project.version}"
useDepAts = true
}
......
......@@ -10,7 +10,7 @@ public class BWCreativeTabs {
public static final CreativeTabs BWTAB = new CreativeTabs("bwm:bwTab") {
@Override
@SideOnly(Side.CLIENT)
public ItemStack getTabIconItem() {
public ItemStack createIcon() {
return new ItemStack(BWMItems.AXLE_GENERATOR);
}
};
......
......@@ -109,7 +109,7 @@ public class ClientEventHandler {
}
public static void renderMiniBlock(World world, Block block, BlockPos pos, ItemStack stack, EntityPlayer player, EnumFacing side, RayTraceResult target, double partial) {
Vec3d vec = target.hitVec.addVector(-target.getBlockPos().getX(),-target.getBlockPos().getY(),-target.getBlockPos().getZ());
Vec3d vec = target.hitVec.add(-target.getBlockPos().getX(),-target.getBlockPos().getY(),-target.getBlockPos().getZ());
float x = (float) vec.x , y = (float) vec.y, z = (float) vec.z;
GlStateManager.enableBlend();
GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
......
......@@ -7,6 +7,7 @@ import com.google.common.collect.Maps;
import net.minecraft.client.resources.AbstractResourcePack;
import net.minecraftforge.fml.common.Loader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
......@@ -41,9 +42,9 @@ public class ResourceProxy extends AbstractResourcePack {
BWMod.logger.info("Override texture: {} to {}", bare, override);
}
@Override
public Set<String> getResourceDomains() {
return RESOURCE_DOMAINS;
public ResourceProxy(File resourcePackFileIn) {
super(resourcePackFileIn);
}
@Override
......@@ -59,6 +60,11 @@ public class ResourceProxy extends AbstractResourcePack {
}
@Override
public Set<String> getResourceDomains() {
return RESOURCE_DOMAINS;
}
@Override
public String getPackName() {
return "bwm-texture-proxy";
......
......@@ -59,7 +59,7 @@ public class SimpleBakedModel implements IBakedModel {
public void addModel(IBakedModel model) {
for (int i = 0; i < 7; i++) {
quads[i].addAll(model.getQuads(null, i == 6 ? null : EnumFacing.getFront(i), 0));
quads[i].addAll(model.getQuads(null, i == 6 ? null : EnumFacing.byIndex(i), 0));
}
}
......
......@@ -44,7 +44,7 @@ public class ModelKiln implements IModel {
public static class Loader implements ICustomModelLoader {
@Override
public boolean accepts(ResourceLocation modelLocation) {
return modelLocation.getResourceDomain().equals(BWMod.MODID) && modelLocation.getResourcePath().contains("kiln");
return modelLocation.getNamespace().equals(BWMod.MODID) && modelLocation.getPath().contains("kiln");
}
@Override
......
......@@ -261,7 +261,7 @@ public class RenderUtils {
public static BufferedImage getTextureImage(ResourceLocation location) {
try {
ResourceLocation pngLocation = new ResourceLocation(location.getResourceDomain(), String.format("%s/%s%s", "textures", location.getResourcePath(), ".png"));
ResourceLocation pngLocation = new ResourceLocation(location.getNamespace(), String.format("%s/%s%s", "textures", location.getPath(), ".png"));
IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(pngLocation);
return TextureUtil.readBufferedImage(resource.getInputStream());
} catch (IOException e) {
......
......@@ -24,9 +24,9 @@ public class TESRFurnaceContent extends TileEntitySpecialRenderer<TileEntityFurn
double x1 = x, z1 = z;
if (facing.getAxis() == EnumFacing.Axis.X) {
x1 += facing.getFrontOffsetX() * 0.00025;
x1 += facing.getXOffset() * 0.00025;
} else {
z1 += facing.getFrontOffsetZ() * 0.00025;
z1 += facing.getZOffset() * 0.00025;
}
RenderUtils.renderFill(FULL, te.getPos(), x1, y, z1, 0, 0, 0, 1, 1, 1, new EnumFacing[]{facing});
}
......
......@@ -184,9 +184,9 @@ public final class BWMBlocks {
registerBlock(STEEL_BLOCK, new ItemBlockMeta(STEEL_BLOCK) {
@Override
public String getUnlocalizedName(ItemStack stack) {
public String getTranslationKey(ItemStack stack) {
if (stack.getMetadata() == 0)
return getUnlocalizedName();
return getTranslationKey();
return "tile.cut_steel_block.name";
}
});
......@@ -254,9 +254,9 @@ public final class BWMBlocks {
public static Block registerBlock(Block block,
@Nullable
Item item) {
if (Objects.equals(block.getUnlocalizedName(), "tile.null")) {
if (Objects.equals(block.getTranslationKey(), "tile.null")) {
//betterwithmods:name => bwm:name
block.setUnlocalizedName("bwm" + block.getRegistryName().toString().substring(BWMod.MODID.length()));
block.setTranslationKey("bwm" + block.getRegistryName().toString().substring(BWMod.MODID.length()));
}
Block registeredBlock = block;
BLOCKS.add(registeredBlock);
......
......@@ -174,9 +174,9 @@ public final class BWMItems {
* @return Registered item.
*/
public static Item registerItem(Item item) {
if (Objects.equals(item.getUnlocalizedName(), "item.null")) {
if (Objects.equals(item.getTranslationKey(), "item.null")) {
//betterwithmods:name => bwm:name
item.setUnlocalizedName("bwm" + item.getRegistryName().toString().substring(BWMod.MODID.length()));
item.setTranslationKey("bwm" + item.getRegistryName().toString().substring(BWMod.MODID.length()));
}
ITEMS.add(item);
return item;
......
......@@ -187,9 +187,9 @@ public final class BWMRecipes {
// janky I know but it works
String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : "";
String name = result.getItem().getRegistryName().getResourcePath() + suffix;
String name = result.getItem().getRegistryName().getPath() + suffix;
if (name.contains("material") || name.contains("aesthetic"))
name = result.getUnlocalizedName().replace("item.bwm:", "").replace("tile.bwm:", "");
name = result.getTranslationKey().replace("item.bwm:", "").replace("tile.bwm:", "");
File f = new File(RECIPE_DIR, name + ".json");
......@@ -229,9 +229,9 @@ public final class BWMRecipes {
// janky I know but it works
String suffix = result.getItem().getHasSubtypes() ? "_" + result.getItemDamage() : "";
String name = result.getItem().getRegistryName().getResourcePath() + suffix;
String name = result.getItem().getRegistryName().getPath() + suffix;
if (name.contains("material"))
name = result.getUnlocalizedName().replace("item.bwm:", "");
name = result.getTranslationKey().replace("item.bwm:", "");
File f = new File(RECIPE_DIR, name + ".json");
......
......@@ -267,7 +267,7 @@ public class BWOreDictionary {
new Wood(new ItemStack(BWMBlocks.BLOOD_LOG), new ItemStack(Blocks.PLANKS, 1, 3), ItemBark.getStack("bloody", 1), true)
));
woods.forEach(w -> getPlankOutput(w.getLog(1)));
logs = OreDictionary.getOres("logWood").stream().filter(stack -> !stack.getItem().getRegistryName().getResourceDomain().equalsIgnoreCase("minecraft") && !stack.getItem().getRegistryName().getResourceDomain().equalsIgnoreCase("betterwithmods")).collect(Collectors.toList());
logs = OreDictionary.getOres("logWood").stream().filter(stack -> !stack.getItem().getRegistryName().getNamespace().equalsIgnoreCase("minecraft") && !stack.getItem().getRegistryName().getNamespace().equalsIgnoreCase("betterwithmods")).collect(Collectors.toList());
for (ItemStack log : logs) {
if (log.getMetadata() == OreDictionary.WILDCARD_VALUE) {//Probably the most common instance of OreDict use for logs.
for (int i = 0; i <= 4; i++) {//Terraqueous's logs go up to 4 for some reason. Should we look for up to 15?
......
......@@ -280,7 +280,7 @@ public class BWRegistry {
}
private static Potion registerPotion(Potion potion) {
String potionName = potion.getRegistryName().getResourcePath();
String potionName = potion.getRegistryName().getPath();
potion.setPotionName("bwm.effect." + potionName);
return potion;
}
......
......@@ -165,7 +165,7 @@ public class BlockAnchor extends BWMBlock implements IRopeConnector {
@Override
public IBlockState getStateFromMeta(int meta) {
return this.getDefaultState().withProperty(FACING, EnumFacing.getFront(meta));
return this.getDefaultState().withProperty(FACING, EnumFacing.byIndex(meta));
}
@Override
......
......@@ -57,7 +57,7 @@ public class BlockBUD extends BWMBlock {
public IBlockState getStateFromMeta(int meta) {
int facing = (meta >> 1);
boolean redstone = (meta & 1) == 1;
return getDefaultState().withProperty(REDSTONE, redstone).withProperty(DirUtils.FACING, EnumFacing.getFront(facing));
return getDefaultState().withProperty(REDSTONE, redstone).withProperty(DirUtils.FACING, EnumFacing.byIndex(facing));
}
@Override
......
......@@ -50,11 +50,11 @@ public class BlockBWMFluid extends BlockFluidClassic {
@Nonnull
@Override
public String getUnlocalizedName() {
public String getTranslationKey() {
Fluid fluid = FluidRegistry.getFluid(fluidName);
if(fluid != null) {
return fluid.getUnlocalizedName();
}
return super.getUnlocalizedName();
return super.getTranslationKey();
}
}
\ No newline at end of file
......@@ -21,7 +21,7 @@ public class BlockBeacon extends net.minecraft.block.BlockBeacon {
public BlockBeacon() {
super();
setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
setUnlocalizedName("beacon");
setTranslationKey("beacon");
setLightLevel(1.0f);
}
......
......@@ -72,8 +72,8 @@ public class BlockBloodLeaves extends BlockLeaves {
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
return Blocks.LEAVES.getBlockLayer();
public BlockRenderLayer getRenderLayer() {
return Blocks.LEAVES.getRenderLayer();
}
@Override
......
......@@ -89,7 +89,7 @@ public class BlockBucket extends BWMBlock implements IRopeConnector {
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}
......
......@@ -51,7 +51,7 @@ public class BlockCandle extends BWMBlock implements IMultiVariants {
double d0 = (double) pos.getX() + 0.5D;
double d1 = (double) pos.getY() + 9/16d;
double d2 = (double) pos.getZ() + 0.5D;
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + 0.27D * (double) UP.getFrontOffsetX(), d1 + 0.22D, d2 + 0.27D * (double) UP.getFrontOffsetZ(), 0.0D, 0.0D, 0.0D);
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + 0.27D * (double) UP.getXOffset(), d1 + 0.22D, d2 + 0.27D * (double) UP.getZOffset(), 0.0D, 0.0D, 0.0D);
worldIn.spawnParticle(EnumParticleTypes.FLAME, d0, d1, d2, 0.0D, 0.0D, 0.0D);
}
......@@ -104,7 +104,7 @@ public class BlockCandle extends BWMBlock implements IMultiVariants {
}
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}
......
......@@ -182,7 +182,7 @@ public class BlockChime extends BWMBlock implements IMultiVariants {
}
@Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) {
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) {
if (!state.getValue(ACTIVE)) {
world.setBlockState(pos, state.withProperty(ACTIVE, true));
world.notifyNeighborsOfStateChange(pos, this, false);
......
......@@ -24,7 +24,7 @@ public class BlockCobble extends Block implements IMultiVariants {
this.setHardness(2.0F);
this.setResistance(5.0F);
this.setCreativeTab(BWCreativeTabs.BWTAB);
this.setUnlocalizedName("bwm:cobble");
this.setTranslationKey("bwm:cobble");
}
@Override
......
......@@ -121,7 +121,7 @@ public class BlockDetector extends BlockRotate {
world.setBlockState(pos, state);
for (int i = 0; i < 6; i++) {
world.neighborChanged(pos.offset(EnumFacing.getFront(i)), this, pos);
world.neighborChanged(pos.offset(EnumFacing.byIndex(i)), this, pos);
}
}
world.scheduleBlockUpdate(pos, this, tickRate(world), 5);
......@@ -177,7 +177,7 @@ public class BlockDetector extends BlockRotate {
isActive = true;
meta -= 8;
}
return this.getDefaultState().withProperty(ACTIVE, isActive).withProperty(DirUtils.FACING, EnumFacing.getFront(meta));
return this.getDefaultState().withProperty(ACTIVE, isActive).withProperty(DirUtils.FACING, EnumFacing.byIndex(meta));
}
@Override
......
......@@ -167,7 +167,7 @@ public class BlockDirtSlab extends BlockSimpleSlab implements IMultiVariants {
@SideOnly(Side.CLIENT)
@Override
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}
......
......@@ -18,7 +18,7 @@ import net.minecraft.world.World;
public class BlockEnderchest extends BlockEnderChest {
public BlockEnderchest() {
setUnlocalizedName("enderChest");
setTranslationKey("enderChest");
}
@Override
......
......@@ -24,7 +24,7 @@ public class BlockFireStoked extends BlockFire {
}
@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
public void onEntityCollision(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
entityIn.setFire(40);
}
......@@ -83,7 +83,7 @@ public class BlockFireStoked extends BlockFire {
BlockPos blockpos = pos.add(i1, k1, j1);
int i2 = this.getNeighborEncouragement(world, blockpos);
if (i2 > 0) {
int j2 = (i2 + 40 + world.getDifficulty().getDifficultyId() * 7) / (meta + 30);
int j2 = (i2 + 40 + world.getDifficulty().getId() * 7) / (meta + 30);
if (flag1) {
j2 /= 2;
}
......@@ -147,7 +147,7 @@ public class BlockFireStoked extends BlockFire {
}
if (iblockstate.getBlock() == Blocks.TNT) {
Blocks.TNT.onBlockDestroyedByPlayer(worldIn, pos, iblockstate.withProperty(BlockTNT.EXPLODE, true));
Blocks.TNT.onPlayerDestroy(worldIn, pos, iblockstate.withProperty(BlockTNT.EXPLODE, true));
}
}
}
......
......@@ -12,7 +12,7 @@ public class BlockFurnace extends net.minecraft.block.BlockFurnace {
if(isBurning) {
setLightLevel(0.875F);
}
setUnlocalizedName("furnace");
setTranslationKey("furnace");
setHardness(3.5F);
setSoundType(SoundType.STONE);
......
......@@ -22,7 +22,7 @@ public class BlockGrassCustom extends BlockGrass {
this.setHardness(0.6F);
this.setSoundType(SoundType.PLANT);
this.setRegistryName("minecraft:grass");
this.setUnlocalizedName("grass");
this.setTranslationKey("grass");
}
......
......@@ -40,7 +40,7 @@ public class BlockHibachi extends BWMBlock {
@Override
public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
boolean powered = world.isBlockIndirectlyGettingPowered(pos) > 0;
boolean powered = world.getRedstonePowerFromNeighbors(pos) > 0;
if (powered) {
if (!isLit(world, pos))
......@@ -76,7 +76,7 @@ public class BlockHibachi extends BWMBlock {
}
public boolean isCurrentlyValid(World world, BlockPos pos) {
boolean powered = world.isBlockIndirectlyGettingPowered(pos) > 0;
boolean powered = world.getRedstonePowerFromNeighbors(pos) > 0;
if (isLit(world, pos) != powered)
return false;
if (isLit(world, pos)) {
......
......@@ -24,7 +24,7 @@ public class BlockIce extends net.minecraft.block.BlockIce {
setHardness(0.5F);
setLightOpacity(3);
setSoundType(SoundType.GLASS);
setUnlocalizedName("ice");
setTranslationKey("ice");
ToolsManager.setPickaxesAsEffectiveAgainst(this);
}
......
......@@ -53,7 +53,7 @@ public class BlockInvisibleLight extends BWMBlock {
}
@Override
public EnumPushReaction getMobilityFlag(IBlockState state) {
public EnumPushReaction getPushReaction(IBlockState state) {
return EnumPushReaction.DESTROY;
}
......@@ -95,7 +95,7 @@ public class BlockInvisibleLight extends BWMBlock {
}
@Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) {
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) {
if (!world.isRemote) {
if (world.getBlockState(pos).getValue(SUNLIGHT)) {
if (entity instanceof EntityLiving) {
......@@ -160,7 +160,7 @@ public class BlockInvisibleLight extends BWMBlock {
sun = true;
meta -= 8;
}
return this.getDefaultState().withProperty(SUNLIGHT, sun).withProperty(DirUtils.FACING, EnumFacing.getFront(meta));
return this.getDefaultState().withProperty(SUNLIGHT, sun).withProperty(DirUtils.FACING, EnumFacing.byIndex(meta));
}
@Override
......
......@@ -22,7 +22,7 @@ public class BlockIronWall extends BWMBlock {
}
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}
......
......@@ -165,7 +165,7 @@ public class BlockLens extends BlockRotate implements IMultiVariants {
}
@Override
public EnumPushReaction getMobilityFlag(IBlockState state) {
public EnumPushReaction getPushReaction(IBlockState state) {
return EnumPushReaction.BLOCK;
}
......@@ -262,7 +262,7 @@ public class BlockLens extends BlockRotate implements IMultiVariants {
lit = true;
meta -= 8;
}
return this.getDefaultState().withProperty(LIT, lit).withProperty(DirUtils.FACING, EnumFacing.getFront(meta));
return this.getDefaultState().withProperty(LIT, lit).withProperty(DirUtils.FACING, EnumFacing.byIndex(meta));
}
@Override
......
......@@ -46,7 +46,7 @@ public class BlockLight extends BWMBlock implements IMultiVariants {
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}
......
......@@ -103,7 +103,7 @@ public class BlockMiningCharge extends BlockTNT {
public void onBlockAdded(World worldIn, BlockPos pos, IBlockState state) {
super.onBlockAdded(worldIn, pos, state);
if (worldIn.isBlockPowered(pos)) {
this.onBlockDestroyedByPlayer(worldIn, pos, state.withProperty(EXPLODE, true));
this.onPlayerDestroy(worldIn, pos, state.withProperty(EXPLODE, true));
worldIn.setBlockToAir(pos);
}
}
......@@ -111,19 +111,19 @@ public class BlockMiningCharge extends BlockTNT {
@Override
public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos other) {
if (worldIn.isBlockPowered(pos)) {
this.onBlockDestroyedByPlayer(worldIn, pos, state.withProperty(EXPLODE, true));
this.onPlayerDestroy(worldIn, pos, state.withProperty(EXPLODE, true));
worldIn.setBlockToAir(pos);
}
}
@Override
public void onBlockExploded(World world, BlockPos pos, Explosion explosion) {
onBlockDestroyedByExplosion(world, pos, explosion);
onExplosionDestroy(world, pos, explosion);
world.setBlockToAir(pos);
}
@Override
public void onBlockDestroyedByExplosion(World worldIn, BlockPos pos, Explosion explosionIn) {
public void onExplosionDestroy(World worldIn, BlockPos pos, Explosion explosionIn) {
if (!worldIn.isRemote) {
EntityMiningCharge miningCharge = new EntityMiningCharge(worldIn, (double) ((float) pos.getX() + 0.5F), (double) pos.getY(), (double) ((float) pos.getZ() + 0.5F), explosionIn.getExplosivePlacedBy(), getFacing(worldIn.getBlockState(pos)));
miningCharge.setFuse((short) (worldIn.rand.nextInt(miningCharge.getFuse() / 4) + miningCharge.getFuse() / 8));
......@@ -132,12 +132,12 @@ public class BlockMiningCharge extends BlockTNT {
}
@Override
public void onBlockDestroyedByPlayer(World worldIn, BlockPos pos, IBlockState state) {
public void onPlayerDestroy(World worldIn, BlockPos pos, IBlockState state) {
this.explode(worldIn, pos, state, null);
}
@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
public void onEntityCollision(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
if (!worldIn.isRemote && entityIn instanceof EntityArrow) {
EntityArrow entityarrow = (EntityArrow) entityIn;
if (entityarrow.isBurning()) {
......@@ -156,7 +156,7 @@ public class BlockMiningCharge extends BlockTNT {
@Override
public IBlockState getStateFromMeta(int meta) {
boolean explode = (meta & 1) > 0;
EnumFacing facing = EnumFacing.getFront(meta >> 1);
EnumFacing facing = EnumFacing.byIndex(meta >> 1);
return this.getDefaultState().withProperty(EXPLODE, explode).withProperty(DirUtils.FACING, facing);
}
......
......@@ -18,7 +18,7 @@ public class BlockMushroom extends net.minecraft.block.BlockMushroom {
this.maxLightLevel = maxLightLevel;
setHardness(0.0F);
setSoundType(SoundType.PLANT);
setUnlocalizedName("mushroom");
setTranslationKey("mushroom");
}
@Override
......
......@@ -20,7 +20,7 @@ public class BlockMyceliumCustom extends BlockMycelium {
this.setHardness(0.6F);
this.setSoundType(SoundType.PLANT);
this.setRegistryName("minecraft:mycelium");
this.setUnlocalizedName("mycelium");
this.setTranslationKey("mycelium");
}
/**
* Spread mycelium or turn mycelium back to dirt.
......
......@@ -18,7 +18,7 @@ public class BlockNetherClay extends BlockClay {
this.setCreativeTab(BWCreativeTabs.BWTAB);
this.setHardness(0.6F);
this.setSoundType(SoundType.GROUND);
this.setUnlocalizedName("bwm:nether_clay");
this.setTranslationKey("bwm:nether_clay");
}
@Override
......
......@@ -188,7 +188,7 @@ public class BlockNetherGrowth extends BWMBlock implements IMultiLocations {
}
@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
public void onEntityCollision(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
if (entityIn instanceof EntityItem) {
ItemStack stack = ((EntityItem) entityIn).getItem();
if (stack.getItem() instanceof ItemFood) {
......@@ -249,7 +249,7 @@ public class BlockNetherGrowth extends BWMBlock implements IMultiLocations {
@SideOnly(Side.CLIENT)
@Override
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}
......
......@@ -98,7 +98,7 @@ public class BlockPane extends BWMBlock {
@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}
......
......@@ -84,8 +84,8 @@ public class BlockPlatform extends BWMBlock {
}
@Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
super.onEntityCollidedWithBlock(worldIn, pos, state, entityIn);
public void onEntityCollision(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
super.onEntityCollision(worldIn, pos, state, entityIn);
if (entityIn instanceof EntityLivingBase && !((EntityLivingBase) entityIn).isOnLadder() && isLadder(state, worldIn, pos, (EntityLivingBase) entityIn)) {
float f5 = 0.15F;
if (entityIn.motionX < -f5)
......@@ -111,7 +111,7 @@ public class BlockPlatform extends BWMBlock {
}
@Override
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}
......
......@@ -48,8 +48,9 @@ public class BlockRawPastry extends Block implements IMultiLocations {
}
}
@Override
public EnumPushReaction getMobilityFlag(IBlockState state) {
public EnumPushReaction getPushReaction(IBlockState state) {
return EnumPushReaction.NORMAL;
}
......
......@@ -9,7 +9,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
......@@ -22,8 +21,8 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockSimpleSlab extends Block {
protected static final AxisAlignedBB AABB_BOTTOM_HALF = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 0.5D, 1.0D);
public BlockSimpleSlab(Material blockMaterialIn, MapColor blockMapColorIn) {
super(blockMaterialIn, blockMapColorIn);