Gui fixes, 393
This commit is contained in:
parent
06632be822
commit
d68c65641d
20 changed files with 189 additions and 452 deletions
|
@ -27,10 +27,8 @@ package techreborn.blocks.cable;
|
|||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockContainer;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
import net.minecraft.state.AbstractProperty;
|
||||
import net.minecraft.state.BooleanProperty;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
|
@ -40,11 +38,10 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.*;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.ChunkCache;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.IWorld;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.BlockStateContainer;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraftforge.energy.CapabilityEnergy;
|
||||
import reborncore.api.ToolManager;
|
||||
|
@ -150,10 +147,6 @@ public class BlockCable extends BlockContainer {
|
|||
return super.onBlockActivated(state, worldIn, pos, playerIn, hand, side, hitX, hitY, hitZ);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int damageDropped(IBlockState state) {
|
||||
return getMetaFromState(state);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube(IBlockState state) {
|
||||
|
@ -166,7 +159,7 @@ public class BlockCable extends BlockContainer {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
|
||||
public boolean shouldSideBeRendered(IBlockState blockState, IWorld blockAccess, BlockPos pos, EnumFacing side) {
|
||||
if (type == TRContent.Cables.GLASSFIBER)
|
||||
return false;
|
||||
else
|
||||
|
|
|
@ -24,30 +24,26 @@
|
|||
|
||||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.BlockFluidClassic;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraft.block.BlockFlowingFluid;
|
||||
import net.minecraft.fluid.FlowingFluid;
|
||||
|
||||
public class BlockFluidBase extends BlockFluidClassic {
|
||||
public class BlockFluidBase extends BlockFlowingFluid {
|
||||
|
||||
public BlockFluidBase(Fluid fluid, Material material) {
|
||||
super(fluid, material);
|
||||
public BlockFluidBase(FlowingFluid fluid, Properties properties) {
|
||||
super(fluid, properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canDisplace(IBlockAccess world, BlockPos pos) {
|
||||
if (world.getBlockState(pos).getMaterial().isLiquid())
|
||||
return false;
|
||||
return super.canDisplace(world, pos);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean displaceIfPossible(World world, BlockPos pos) {
|
||||
if (world.getBlockState(pos).getMaterial().isLiquid())
|
||||
return false;
|
||||
return super.displaceIfPossible(world, pos);
|
||||
}
|
||||
// @Override
|
||||
// public boolean canDisplace(IBlockAccess world, BlockPos pos) {
|
||||
// if (world.getBlockState(pos).getMaterial().isLiquid())
|
||||
// return false;
|
||||
// return super.canDisplace(world, pos);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean displaceIfPossible(World world, BlockPos pos) {
|
||||
// if (world.getBlockState(pos).getMaterial().isLiquid())
|
||||
// return false;
|
||||
// return super.displaceIfPossible(world, pos);
|
||||
// }
|
||||
}
|
||||
|
|
|
@ -24,26 +24,20 @@
|
|||
|
||||
package techreborn.blocks.fluid;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockFaceShape;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraft.fluid.FlowingFluid;
|
||||
|
||||
public class BlockFluidTechReborn extends BlockFluidBase {
|
||||
|
||||
String name;
|
||||
|
||||
public BlockFluidTechReborn(Fluid fluid, Material material, String name) {
|
||||
super(fluid, material);
|
||||
setTranslationKey(name);
|
||||
public BlockFluidTechReborn(FlowingFluid fluid, Properties properties, String name) {
|
||||
super(fluid, properties);
|
||||
//setTranslationKey(name);
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) {
|
||||
return BlockFaceShape.UNDEFINED;
|
||||
}
|
||||
//
|
||||
// @Override
|
||||
// public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) {
|
||||
// return BlockFaceShape.UNDEFINED;
|
||||
// }
|
||||
}
|
||||
|
|
|
@ -33,6 +33,6 @@ public class TechRebornFluid extends Fluid {
|
|||
super(fluidName,
|
||||
new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing"),
|
||||
new ResourceLocation("techreborn:blocks/fluids/" + fluidName.replaceFirst("fluid", "") + "_flowing"));
|
||||
FluidRegistry.addBucketForFluid(this);
|
||||
//FluidRegistry.addBucketForFluid(this);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue