diff --git a/build.gradle b/build.gradle index e618002..bc496f0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,12 @@ buildscript { repositories { - jcenter() - maven { url 'https://www.dimdev.org/maven/' } + mavenCentral() + maven { url 'https://www.jitpack.io' } + maven { url 'https://files.minecraftforge.net/maven' } maven { url 'http://repo.spongepowered.org/maven' } } dependencies { - classpath 'org.dimdev:ForgeGradle:2.3-SNAPSHOT' + classpath 'com.github.Chocohead:ForgeGradle:jitpack-SNAPSHOT' classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' } } @@ -16,7 +17,7 @@ apply plugin: 'java' group 'com.mrcrayfish' version '0.1.0' -archivesBaseName = 'furniture-rift' +archivesBaseName = 'furniture-rift1.13.2' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -24,15 +25,17 @@ targetCompatibility = 1.8 repositories { mavenCentral() maven { url 'https://www.dimdev.org/maven/' } + maven { url 'https://www.jitpack.io' } } dependencies { - implementation 'org.dimdev:rift:1.0.4-65:dev' + implementation 'com.github.Chocohead:Rift:jitpack-SNAPSHOT:dev' + implementation 'org.dimdev:mixin:0.7.11-SNAPSHOT' } minecraft { - version = '1.13' - mappings = 'snapshot_20180826' + version = '1.13.2' + mappings = 'snapshot_20181130' runDir = 'run' tweakClass = 'org.dimdev.riftloader.launch.RiftLoaderClientTweaker' } @@ -40,4 +43,4 @@ minecraft { mixin { defaultObfuscationEnv notch add sourceSets.main, 'mixins.cfmrift.refmap.json' -} \ No newline at end of file +} diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockDesk.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockDesk.java index 4005a82..87ff388 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockDesk.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockDesk.java @@ -24,8 +24,8 @@ public class BlockDesk extends BlockFurnitureWaterlogged implements IDesk public BlockDesk(EnumDyeColor color) { - super(Block.Builder.create(Material.WOOD, color).hardnessAndResistance(1.0F, 1.0F)); - this.setDefaultState(this.getStateContainer().getBaseState().withProperty(HORIZONTAL_FACING, EnumFacing.NORTH).withProperty(TYPE, DeskType.NONE).withProperty(WATERLOGGED, false)); + super(Block.Properties.create(Material.WOOD, color).hardnessAndResistance(1.0F, 1.0F)); + this.setDefaultState(this.getStateContainer().getBaseState().with(HORIZONTAL_FACING, EnumFacing.NORTH).with(TYPE, DeskType.NONE).with(WATERLOGGED, false)); } @Override @@ -43,42 +43,42 @@ public IBlockState updatePostPlacement(IBlockState state, EnumFacing facing, IBl private IBlockState getActualState(IWorld world, BlockPos pos, IBlockState state) { - if(StateHelper.getBlock(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.DOWN) instanceof IDesk) + if(StateHelper.getBlock(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.DOWN) instanceof IDesk) { - if(StateHelper.getRotation(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.DOWN) == StateHelper.Direction.RIGHT) + if(StateHelper.getRotation(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.DOWN) == StateHelper.Direction.RIGHT) { - return state.withProperty(TYPE, DeskType.CORNER_RIGHT); + return state.with(TYPE, DeskType.CORNER_RIGHT); } - else if(StateHelper.getRotation(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.DOWN) == StateHelper.Direction.LEFT) + else if(StateHelper.getRotation(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.DOWN) == StateHelper.Direction.LEFT) { - return state.withProperty(TYPE, DeskType.CORNER_LEFT); + return state.with(TYPE, DeskType.CORNER_LEFT); } } boolean left = false; boolean right = false; - if(StateHelper.getBlock(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.LEFT) instanceof IDesk) + if(StateHelper.getBlock(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.LEFT) instanceof IDesk) { left = true; } - if(StateHelper.getBlock(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.RIGHT) instanceof IDesk) + if(StateHelper.getBlock(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.RIGHT) instanceof IDesk) { right = true; } if(left && !right) { - return state.withProperty(TYPE, DeskType.LEFT); + return state.with(TYPE, DeskType.LEFT); } else if(!left && right) { - return state.withProperty(TYPE, DeskType.RIGHT); + return state.with(TYPE, DeskType.RIGHT); } else if(!left && !right) { - return state.withProperty(TYPE, DeskType.NONE); + return state.with(TYPE, DeskType.NONE); } - return state.withProperty(TYPE, DeskType.BOTH); + return state.with(TYPE, DeskType.BOTH); } @Override diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFourLegTable.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFourLegTable.java index 4e5ca58..1b25612 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFourLegTable.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFourLegTable.java @@ -11,7 +11,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.IBooleanFunction; -import net.minecraft.util.math.shapes.ShapeUtils; +import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; @@ -31,7 +31,7 @@ public class BlockFourLegTable extends BlockWaterlogged public final ImmutableMap SHAPES; - public BlockFourLegTable(Builder builder) + public BlockFourLegTable(Properties builder) { super(builder); SHAPES = this.generateShapes(this.getStateContainer().getValidStates()); @@ -48,10 +48,10 @@ private ImmutableMap generateShapes(ImmutableList builder = new ImmutableMap.Builder<>(); for(IBlockState state : states) { - boolean forward = state.getValue(FORWARD); - boolean back = state.getValue(BACK); - boolean left = state.getValue(LEFT); - boolean right = state.getValue(RIGHT); + boolean forward = state.get(FORWARD); + boolean back = state.get(BACK); + boolean left = state.get(LEFT); + boolean right = state.get(RIGHT); List shapes = new ArrayList<>(); shapes.add(TABLE_TOP_SHAPE); @@ -102,7 +102,7 @@ public IBlockState updatePostPlacement(IBlockState state, EnumFacing facing, IBl boolean back = world.getBlockState(pos.south()).getBlock() == this; boolean left = world.getBlockState(pos.west()).getBlock() == this; boolean right = world.getBlockState(pos.east()).getBlock() == this; - return state.withProperty(FORWARD, forward).withProperty(BACK, back).withProperty(LEFT, left).withProperty(RIGHT, right); + return state.with(FORWARD, forward).with(BACK, back).with(LEFT, left).with(RIGHT, right); } @Override diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurniture.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurniture.java index e988f1a..629edb8 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurniture.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurniture.java @@ -14,7 +14,7 @@ public abstract class BlockFurniture extends BlockHorizontal { - public BlockFurniture(Block.Builder builder) + public BlockFurniture(Block.Properties builder) { super(builder); } @@ -22,7 +22,7 @@ public BlockFurniture(Block.Builder builder) @Override public IBlockState getStateForPlacement(BlockItemUseContext context) { - return this.getDefaultState().withProperty(HORIZONTAL_FACING, context.getPlacementHorizontalFacing()); + return this.getDefaultState().with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing()); } @Override diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureTile.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureTile.java index adf4b7c..9fad29a 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureTile.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureTile.java @@ -12,7 +12,7 @@ public abstract class BlockFurnitureTile extends BlockFurniture implements ITileEntityProvider { - public BlockFurnitureTile(Block.Builder builder) + public BlockFurnitureTile(Block.Properties builder) { super(builder); } diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureWaterlogged.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureWaterlogged.java index 1066f8a..781025f 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureWaterlogged.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockFurnitureWaterlogged.java @@ -2,8 +2,6 @@ import net.minecraft.block.Block; -import net.minecraft.block.BlockHorizontal; -import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.fluid.IFluidState; import net.minecraft.init.Fluids; @@ -11,16 +9,12 @@ import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; public abstract class BlockFurnitureWaterlogged extends BlockFurniture implements IDefaultBucketPickupHandler, IDefaultLiquidContainer { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; - public BlockFurnitureWaterlogged(Builder builder) + public BlockFurnitureWaterlogged(Properties builder) { super(builder); } @@ -29,13 +23,13 @@ public BlockFurnitureWaterlogged(Builder builder) public IBlockState getStateForPlacement(BlockItemUseContext context) { IFluidState fluidState = context.getWorld().getFluidState(context.getPos()); - return this.getDefaultState().withProperty(HORIZONTAL_FACING, context.getPlacementHorizontalFacing()).withProperty(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); + return this.getDefaultState().with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing()).with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); } @Override public IFluidState getFluidState(IBlockState state) { - return state.getValue(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : super.getFluidState(state); + return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : super.getFluidState(state); } @Override diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernChair.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernChair.java index 082290c..b074910 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernChair.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernChair.java @@ -5,27 +5,15 @@ import com.mrcrayfish.furniture.rift.entity.EntitySeat; import com.mrcrayfish.furniture.rift.utils.VoxelShapeHelper; import net.minecraft.block.Block; -import net.minecraft.block.IBucketPickupHandler; -import net.minecraft.block.ILiquidContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.IFluidState; -import net.minecraft.init.Fluids; import net.minecraft.item.EnumDyeColor; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; -import net.minecraft.state.properties.SlabType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.IBooleanFunction; -import net.minecraft.util.math.shapes.ShapeUtils; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import java.util.ArrayList; @@ -37,8 +25,8 @@ public class BlockModernChair extends BlockFurnitureWaterlogged public BlockModernChair() { - super(Block.Builder.create(Material.WOOD, EnumDyeColor.WHITE).hardnessAndResistance(1.0F, 1.0F)); - this.setDefaultState(this.getStateContainer().getBaseState().withProperty(HORIZONTAL_FACING, EnumFacing.NORTH).withProperty(WATERLOGGED, false)); + super(Block.Properties.create(Material.WOOD, EnumDyeColor.WHITE).hardnessAndResistance(1.0F, 1.0F)); + this.setDefaultState(this.getStateContainer().getBaseState().with(HORIZONTAL_FACING, EnumFacing.NORTH).with(WATERLOGGED, false)); SHAPES = this.generateShapes(this.getStateContainer().getValidStates()); } @@ -55,7 +43,7 @@ private ImmutableMap generateShapes(ImmutableList builder = new ImmutableMap.Builder<>(); for(IBlockState state : states) { - EnumFacing facing = state.getValue(HORIZONTAL_FACING); + EnumFacing facing = state.get(HORIZONTAL_FACING); List shapes = new ArrayList<>(); shapes.add(CHAIR_SEAT[facing.getHorizontalIndex()]); diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernCouch.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernCouch.java index 2a0bfed..e75c5cf 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernCouch.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernCouch.java @@ -35,8 +35,8 @@ public class BlockModernCouch extends BlockFurnitureWaterlogged public BlockModernCouch(EnumDyeColor color) { - super(Block.Builder.create(Material.WOOD, color).hardnessAndResistance(0.5F, 1.0F)); - this.setDefaultState(this.getStateContainer().getBaseState().withProperty(HORIZONTAL_FACING, EnumFacing.NORTH).withProperty(TYPE, CouchType.BOTH).withProperty(WATERLOGGED, false)); + super(Block.Properties.create(Material.WOOD, color).hardnessAndResistance(0.5F, 1.0F)); + this.setDefaultState(this.getStateContainer().getBaseState().with(HORIZONTAL_FACING, EnumFacing.NORTH).with(TYPE, CouchType.BOTH).with(WATERLOGGED, false)); SHAPES = this.generateShapes(this.getStateContainer().getValidStates()); } @@ -52,8 +52,8 @@ private ImmutableMap generateShapes(ImmutableList builder = new ImmutableMap.Builder<>(); for(IBlockState state : states) { - EnumFacing facing = state.getValue(HORIZONTAL_FACING); - CouchType type = state.getValue(TYPE); + EnumFacing facing = state.get(HORIZONTAL_FACING); + CouchType type = state.get(TYPE); List shapes = new ArrayList<>(); shapes.add(COUCH_BASE_SHAPE[facing.getHorizontalIndex()]); @@ -113,35 +113,35 @@ private IBlockState getActualState(IWorld world, BlockPos pos, IBlockState state boolean left = false; boolean right = false; - if(StateHelper.getBlock(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.LEFT) instanceof BlockModernCouch) + if(StateHelper.getBlock(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.LEFT) instanceof BlockModernCouch) { - if(StateHelper.getRotation(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.LEFT) == StateHelper.Direction.DOWN) + if(StateHelper.getRotation(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.LEFT) == StateHelper.Direction.DOWN) { left = true; } } - if(StateHelper.getBlock(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.RIGHT) instanceof BlockModernCouch) + if(StateHelper.getBlock(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.RIGHT) instanceof BlockModernCouch) { - if(StateHelper.getRotation(world, pos, state.getValue(HORIZONTAL_FACING), StateHelper.Direction.RIGHT) == StateHelper.Direction.DOWN) + if(StateHelper.getRotation(world, pos, state.get(HORIZONTAL_FACING), StateHelper.Direction.RIGHT) == StateHelper.Direction.DOWN) { right = true; } } if(left && right) { - return state.withProperty(TYPE, CouchType.BOTH); + return state.with(TYPE, CouchType.BOTH); } else if(!left && !right) { - return state.withProperty(TYPE, CouchType.NONE); + return state.with(TYPE, CouchType.NONE); } else if(left) { - return state.withProperty(TYPE, CouchType.LEFT); + return state.with(TYPE, CouchType.LEFT); } else { - return state.withProperty(TYPE, CouchType.RIGHT); + return state.with(TYPE, CouchType.RIGHT); } } diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTV.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTV.java index c6a75ce..4643bb2 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTV.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTV.java @@ -28,8 +28,8 @@ public class BlockModernTV extends BlockFurnitureWaterlogged public BlockModernTV() { - super(Block.Builder.create(Material.IRON, EnumDyeColor.GRAY)); - this.setDefaultState(this.getStateContainer().getBaseState().withProperty(HORIZONTAL_FACING, EnumFacing.NORTH).withProperty(MOUNTED, false)); + super(Block.Properties.create(Material.IRON, EnumDyeColor.GRAY)); + this.setDefaultState(this.getStateContainer().getBaseState().with(HORIZONTAL_FACING, EnumFacing.NORTH).with(MOUNTED, false)); SHAPES = this.generateShapes(this.getStateContainer().getValidStates()); } @@ -41,8 +41,8 @@ private ImmutableMap generateShapes(ImmutableList builder = new ImmutableMap.Builder<>(); for(IBlockState state : states) { - EnumFacing facing = state.getValue(HORIZONTAL_FACING); - boolean mounted = state.getValue(MOUNTED); + EnumFacing facing = state.get(HORIZONTAL_FACING); + boolean mounted = state.get(MOUNTED); VoxelShape shape = mounted ? MOUNTED_SHAPE[facing.getHorizontalIndex()] : NORMAL_SHAPE[facing.getHorizontalIndex()]; builder.put(state, shape); } @@ -68,7 +68,7 @@ public IBlockState getStateForPlacement(BlockItemUseContext context) IBlockState state = super.getStateForPlacement(context); if(context.getFace().getHorizontalIndex() != -1) { - state = state.withProperty(MOUNTED, true); + state = state.with(MOUNTED, true); } return state; } diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTable.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTable.java index 2937983..68a6bb1 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTable.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockModernTable.java @@ -1,7 +1,7 @@ package com.mrcrayfish.furniture.rift.block; import net.minecraft.block.Block; -import net.minecraft.block.material.MapColor; +import net.minecraft.block.material.MaterialColor; import net.minecraft.block.material.Material; /** @@ -11,7 +11,7 @@ public class BlockModernTable extends BlockFourLegTable { public BlockModernTable() { - super(Block.Builder.create(Material.WOOD, MapColor.WHITE_STAINED_HARDENED_CLAY).hardnessAndResistance(1.0F, 1.0F)); - this.setDefaultState(this.getStateContainer().getBaseState().withProperty(FORWARD, false).withProperty(BACK, false).withProperty(LEFT, false).withProperty(RIGHT, false).withProperty(WATERLOGGED, false)); + super(Block.Properties.create(Material.WOOD, MaterialColor.WHITE_TERRACOTTA).hardnessAndResistance(1.0F, 1.0F)); + this.setDefaultState(this.getStateContainer().getBaseState().with(FORWARD, false).with(BACK, false).with(LEFT, false).with(RIGHT, false).with(WATERLOGGED, false)); } } diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockWaterlogged.java b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockWaterlogged.java index e4330c9..cbb7271 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/BlockWaterlogged.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/BlockWaterlogged.java @@ -16,7 +16,7 @@ public class BlockWaterlogged extends Block implements IDefaultBucketPickupHandl { public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; - public BlockWaterlogged(Builder builder) + public BlockWaterlogged(Properties builder) { super(builder); } @@ -25,13 +25,13 @@ public BlockWaterlogged(Builder builder) public IBlockState getStateForPlacement(BlockItemUseContext context) { IFluidState fluidState = context.getWorld().getFluidState(context.getPos()); - return this.getDefaultState().withProperty(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); + return this.getDefaultState().with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); } @Override public IFluidState getFluidState(IBlockState state) { - return state.getValue(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : super.getFluidState(state); + return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : super.getFluidState(state); } @Override diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultBucketPickupHandler.java b/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultBucketPickupHandler.java index 5a0bebf..6cadad0 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultBucketPickupHandler.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultBucketPickupHandler.java @@ -16,9 +16,9 @@ public interface IDefaultBucketPickupHandler extends IBucketPickupHandler @Override default Fluid pickupFluid(IWorld world, BlockPos pos, IBlockState state) { - if(state.getValue(BlockStateProperties.WATERLOGGED)) + if(state.get(BlockStateProperties.WATERLOGGED)) { - world.setBlockState(pos, state.withProperty(BlockStateProperties.WATERLOGGED, false), 3); + world.setBlockState(pos, state.with(BlockStateProperties.WATERLOGGED, false), 3); return Fluids.WATER; } return Fluids.EMPTY; diff --git a/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultLiquidContainer.java b/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultLiquidContainer.java index 3ca1aad..d6e0531 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultLiquidContainer.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/block/IDefaultLiquidContainer.java @@ -18,18 +18,18 @@ public interface IDefaultLiquidContainer extends ILiquidContainer @Override default boolean canContainFluid(IBlockReader reader, BlockPos pos, IBlockState state, Fluid fluid) { - return !state.getValue(BlockStateProperties.WATERLOGGED) && fluid == Fluids.WATER; + return !state.get(BlockStateProperties.WATERLOGGED) && fluid == Fluids.WATER; } @Override default boolean receiveFluid(IWorld world, BlockPos pos, IBlockState state, IFluidState fluidState) { - if(!state.getValue(BlockStateProperties.WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) + if(!state.get(BlockStateProperties.WATERLOGGED) && fluidState.getFluid() == Fluids.WATER) { if(!world.isRemote()) { - world.setBlockState(pos, state.withProperty(BlockStateProperties.WATERLOGGED, true), 3); - world.getPendingFluidTicks().scheduleUpdate(pos, fluidState.getFluid(), fluidState.getFluid().getTickRate(world)); + world.setBlockState(pos, state.with(BlockStateProperties.WATERLOGGED, true), 3); + world.getPendingFluidTicks().scheduleTick(pos, fluidState.getFluid(), fluidState.getFluid().getTickRate(world)); } return true; } diff --git a/src/main/java/com/mrcrayfish/furniture/rift/entity/EntitySeat.java b/src/main/java/com/mrcrayfish/furniture/rift/entity/EntitySeat.java index 57796fb..6404fa5 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/entity/EntitySeat.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/entity/EntitySeat.java @@ -32,7 +32,7 @@ public EntitySeat(World world, BlockPos source, double yOffset) this.setPosition(source.getX() + 0.5, source.getY() + yOffset, source.getZ() + 0.5); } - @Override + //@Override public void onEntityUpdate() { if(source == null) @@ -67,13 +67,13 @@ protected boolean canBeRidden(Entity p_canBeRidden_1_) } @Override - protected void entityInit() {} - + protected void registerData() {} + @Override - protected void readEntityFromNBT(NBTTagCompound nbtTagCompound) {} + protected void readAdditional(NBTTagCompound nbtTagCompound) {} @Override - protected void writeEntityToNBT(NBTTagCompound nbtTagCompound) {} + protected void writeAdditional(NBTTagCompound nbtTagCompound) {} public static boolean create(World world, BlockPos pos, double yOffset, EntityPlayer player) { diff --git a/src/main/java/com/mrcrayfish/furniture/rift/utils/StateHelper.java b/src/main/java/com/mrcrayfish/furniture/rift/utils/StateHelper.java index 648522e..b4702a8 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/utils/StateHelper.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/utils/StateHelper.java @@ -18,7 +18,7 @@ public static Block getBlock(IWorld world, BlockPos pos, EnumFacing facing, Dire public static Direction getRotation(IWorld world, BlockPos pos, EnumFacing facing, Direction dir) { BlockPos target = getBlockPosRelativeTo(pos, facing, dir); - EnumFacing other = world.getBlockState(target).getValue(BlockFurniture.HORIZONTAL_FACING); + EnumFacing other = world.getBlockState(target).get(BlockFurniture.HORIZONTAL_FACING); return getDirectionRelativeTo(facing, other); } diff --git a/src/main/java/com/mrcrayfish/furniture/rift/utils/VoxelShapeHelper.java b/src/main/java/com/mrcrayfish/furniture/rift/utils/VoxelShapeHelper.java index 4be15b7..79c9597 100644 --- a/src/main/java/com/mrcrayfish/furniture/rift/utils/VoxelShapeHelper.java +++ b/src/main/java/com/mrcrayfish/furniture/rift/utils/VoxelShapeHelper.java @@ -2,7 +2,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.shapes.IBooleanFunction; -import net.minecraft.util.math.shapes.ShapeUtils; +import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.util.math.shapes.VoxelShape; import java.util.Collection; @@ -12,10 +12,10 @@ public class VoxelShapeHelper { public static VoxelShape combineAll(Collection shapes) { - VoxelShape result = ShapeUtils.empty(); + VoxelShape result = VoxelShapes.empty(); for(VoxelShape shape : shapes) { - result = ShapeUtils.combine(result, shape, IBooleanFunction.OR); + result = VoxelShapes.combine(result, shape, IBooleanFunction.OR); } return result.simplify(); } @@ -32,7 +32,7 @@ public static VoxelShape[] getRotatedVoxelShapes(VoxelShape source) private static VoxelShape rotateShape(VoxelShape source, EnumFacing facing) { double[] adjustedValues = adjustValues(facing, source.getStart(EnumFacing.Axis.X), source.getStart(EnumFacing.Axis.Z), source.getEnd(EnumFacing.Axis.X), source.getEnd(EnumFacing.Axis.Z)); - return ShapeUtils.create(adjustedValues[0], source.getStart(EnumFacing.Axis.Y), adjustedValues[1], adjustedValues[2], source.getEnd(EnumFacing.Axis.Y), adjustedValues[3]); + return VoxelShapes.create(adjustedValues[0], source.getStart(EnumFacing.Axis.Y), adjustedValues[1], adjustedValues[2], source.getEnd(EnumFacing.Axis.Y), adjustedValues[3]); } private static double[] adjustValues(EnumFacing facing, double var1, double var2, double var3, double var4) diff --git a/src/main/resources/data/cfmrift/recipes/modern_chair.json b/src/main/resources/data/cfmrift/recipes/modern_chair.json index 2f46424..9dd6f0e 100644 --- a/src/main/resources/data/cfmrift/recipes/modern_chair.json +++ b/src/main/resources/data/cfmrift/recipes/modern_chair.json @@ -14,6 +14,6 @@ } }, "result": { - "item": "cfmrift:modern_table" + "item": "cfmrift:modern_chair" } } \ No newline at end of file