add shaders, remove multi block layer
This commit is contained in:
parent
1e7ef94ceb
commit
563f235b2f
129 changed files with 1848 additions and 1486 deletions
|
@ -1056,11 +1056,6 @@ public class Block {
|
|||
(double)pos.getX() + this.maxX, (double)pos.getY() + this.maxY, (double)pos.getZ() + this.maxZ);
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean isXrayVisible() {
|
||||
return false;
|
||||
|
|
|
@ -166,11 +166,6 @@ public class BlockBed extends Block implements Rotatable {
|
|||
return 1;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
// public void onBlockHarvested(World worldIn, BlockPos pos, State state, EntityNPC player) {
|
||||
// if(player.creative && state.getValue(PART) == BlockBed.EnumPartType.HEAD) {
|
||||
// BlockPos blockpos = pos.offset(((Facing)state.getValue(FACING)).getOpposite());
|
||||
|
|
|
@ -7,7 +7,6 @@ import common.init.SoundEvent;
|
|||
import common.model.Model;
|
||||
import common.model.Model.ModelProvider;
|
||||
import common.util.BlockPos;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.world.AWorldServer;
|
||||
import common.world.State;
|
||||
|
@ -69,11 +68,6 @@ public class BlockCake extends Block
|
|||
return worldIn.getState(pos.down()).getBlock().getMaterial().isSolid();
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
return provider.getModel("cake_side")
|
||||
.add(1, 0, 1, 15, 8, 15)
|
||||
|
|
|
@ -250,11 +250,6 @@ public class BlockDoor extends Block implements Rotatable {
|
|||
return 1;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public static Facing getFacing(IBlockAccess world, BlockPos pos) {
|
||||
return world.getState(pos).getValue(FACING);
|
||||
}
|
||||
|
|
|
@ -17,7 +17,6 @@ import common.model.Model.ModelProvider;
|
|||
import common.model.GuiPosition;
|
||||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.world.State;
|
||||
import common.world.World;
|
||||
|
@ -125,11 +124,6 @@ public class BlockFlowerPot extends Block
|
|||
return Items.flowerpot;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
if(this.content == null)
|
||||
return provider.getModel("flower_pot")
|
||||
|
|
|
@ -6,7 +6,6 @@ import common.entity.Entity;
|
|||
import common.item.CheatTab;
|
||||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.Serverside;
|
||||
import common.world.AWorldServer;
|
||||
|
@ -23,11 +22,6 @@ public class BlockGlass extends Block {
|
|||
return 0;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean isOpaqueCube() {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -12,7 +12,6 @@ import common.model.GuiPosition;
|
|||
import common.properties.Property;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.world.AWorldServer;
|
||||
import common.world.IWorldAccess;
|
||||
|
@ -132,11 +131,6 @@ public class BlockLadder extends Block implements Rotatable
|
|||
return worldIn.getState(pos.offset(facing.getOpposite())).getBlock().isNormalCube();
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {FACING};
|
||||
|
|
|
@ -17,7 +17,6 @@ import common.properties.PropertyBool;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.Serverside;
|
||||
import common.world.AWorldServer;
|
||||
|
@ -181,11 +180,6 @@ public class BlockPane extends Block
|
|||
return true;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {NORTH, EAST, WEST, SOUTH};
|
||||
|
|
|
@ -17,7 +17,6 @@ import common.model.Model.ModelProvider;
|
|||
import common.properties.Property;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.Facing.Axis;
|
||||
import common.world.IWorldAccess;
|
||||
|
@ -175,11 +174,6 @@ public class BlockSlab extends Block implements Directional {
|
|||
return model;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return this.textureOverlay != null;
|
||||
}
|
||||
|
||||
public boolean getSumBrightness() {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,6 @@ import common.properties.PropertyBool;
|
|||
import common.properties.PropertyEnum;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.HitPosition;
|
||||
import common.util.Identifyable;
|
||||
|
@ -168,11 +167,6 @@ public class BlockTrapDoor extends Block implements Rotatable
|
|||
return iblockstate;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {FACING, OPEN, HALF};
|
||||
|
|
|
@ -8,7 +8,6 @@ import common.model.Model;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.world.State;
|
||||
import common.world.World;
|
||||
|
@ -88,11 +87,6 @@ public class BlockBush extends Block
|
|||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public static Model makeCrossModel(Model model) {
|
||||
return model
|
||||
|
|
|
@ -13,7 +13,6 @@ import common.properties.PropertyInteger;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.vars.Vars;
|
||||
import common.world.State;
|
||||
|
@ -128,11 +127,6 @@ public class BlockCactus extends Block
|
|||
entityIn.attackEntityFrom(DamageSource.cactus, 1);
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {AGE};
|
||||
|
|
|
@ -11,7 +11,6 @@ import common.properties.Property;
|
|||
import common.properties.PropertyBool;
|
||||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.Clientside;
|
||||
import common.vars.Vars;
|
||||
import common.world.IWorldAccess;
|
||||
import common.world.State;
|
||||
|
@ -92,11 +91,6 @@ public class BlockGrass extends Block implements IGrowable
|
|||
return new Property[] {SNOWY};
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
if(state.getValue(SNOWY))
|
||||
return provider.getModel("dirt").add().d().u("snow").nswe().add().nswe("soil_snowed");
|
||||
|
|
|
@ -2,7 +2,6 @@ package common.block.foliage;
|
|||
|
||||
import common.block.Block;
|
||||
import common.block.Material;
|
||||
import common.util.Clientside;
|
||||
|
||||
public class BlockLeavesBase extends Block
|
||||
{
|
||||
|
@ -26,11 +25,6 @@ public class BlockLeavesBase extends Block
|
|||
// this.transparent = transparent;
|
||||
// }
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean isVisuallyOpaque()
|
||||
{
|
||||
return false;
|
||||
|
|
|
@ -11,7 +11,6 @@ import common.properties.Property;
|
|||
import common.properties.PropertyBool;
|
||||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.Clientside;
|
||||
import common.util.ParticleType;
|
||||
import common.vars.Vars;
|
||||
import common.world.IWorldAccess;
|
||||
|
@ -93,11 +92,6 @@ public class BlockMycelium extends Block
|
|||
return new Property[] {SNOWY};
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
if(state.getValue(SNOWY))
|
||||
return provider.getModel("dirt").add().d().u("snow").nswe().add().nswe("soil_snowed");
|
||||
|
|
|
@ -12,7 +12,6 @@ import common.properties.PropertyInteger;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.vars.Vars;
|
||||
import common.world.State;
|
||||
|
@ -139,11 +138,6 @@ public class BlockReed extends Block
|
|||
return false;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {AGE};
|
||||
|
|
|
@ -13,7 +13,6 @@ import common.properties.PropertyBool;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.vars.Vars;
|
||||
import common.world.AWorldServer;
|
||||
import common.world.IWorldAccess;
|
||||
|
@ -50,11 +49,6 @@ public class BlockSwamp extends Block
|
|||
entityIn.motionZ *= 0.6D;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
if(state.getValue(SNOWY))
|
||||
return provider.getModel("dirt").add().d().u("snow").nswe().add().nswe("soil_snowed");
|
||||
|
|
|
@ -11,7 +11,6 @@ import common.properties.Property;
|
|||
import common.properties.PropertyBool;
|
||||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.Clientside;
|
||||
import common.world.IWorldAccess;
|
||||
import common.world.State;
|
||||
|
||||
|
@ -42,11 +41,6 @@ public class BlockTianSoil extends Block
|
|||
return new Property[] {SNOWY};
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
if(state.getValue(SNOWY))
|
||||
return provider.getModel("tian").add().d().u("snow").nswe().add().nswe("tian_soil_snowed");
|
||||
|
|
|
@ -19,7 +19,6 @@ import common.rng.Random;
|
|||
import common.tileentity.TileEntity;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.Equipment;
|
||||
import common.vars.Vars;
|
||||
|
@ -415,11 +414,6 @@ public class BlockVine extends Block
|
|||
}
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {UP, NORTH, EAST, SOUTH, WEST};
|
||||
|
|
|
@ -16,7 +16,6 @@ import common.properties.PropertyInteger;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.ParticleType;
|
||||
import common.util.PortalType;
|
||||
|
@ -427,11 +426,6 @@ public class BlockFire extends Block
|
|||
// return MapColor.tntColor;
|
||||
// }
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {AGE, NORTH, EAST, SOUTH, WEST, UPPER, FLIP, ALT};
|
||||
|
|
|
@ -12,7 +12,6 @@ import common.properties.Property;
|
|||
import common.properties.PropertyBool;
|
||||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.Clientside;
|
||||
import common.world.IWorldAccess;
|
||||
import common.world.State;
|
||||
|
||||
|
@ -38,11 +37,6 @@ public class BlockPodzol extends Block {
|
|||
return Items.dirt;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
if(state.getValue(SNOWY))
|
||||
return provider.getModel("dirt").add().d().u("snow").nswe().add().nswe("soil_snowed");
|
||||
|
|
|
@ -13,7 +13,6 @@ import common.model.GuiPosition;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.world.State;
|
||||
import common.world.World;
|
||||
|
||||
|
@ -64,11 +63,6 @@ public class BlockWeb extends Block
|
|||
return true;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
return BlockBush.makeCrossModel(provider.getModel("web"));
|
||||
}
|
||||
|
|
|
@ -44,11 +44,6 @@ public class BlockBrewingStand extends BlockMachine {
|
|||
worldIn.clientParticle(ParticleType.SMOKE, d0, d1, d2);
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
return provider.getModel("brewing_stand")
|
||||
|
|
|
@ -5,7 +5,6 @@ import common.item.CheatTab;
|
|||
import common.model.Model;
|
||||
import common.model.Model.ModelProvider;
|
||||
import common.tileentity.TileEntity;
|
||||
import common.util.Clientside;
|
||||
import common.tileentity.DeviceEffectGenerator;
|
||||
import common.world.State;
|
||||
|
||||
|
@ -28,11 +27,6 @@ public class BlockEffectGenerator extends BlockMachine {
|
|||
return false;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
return provider.getModel("glass")
|
||||
.add(0, 0, 0, 16, 16, 16)
|
||||
|
|
|
@ -15,7 +15,6 @@ import common.properties.PropertyBool;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.Serverside;
|
||||
import common.world.IWorldAccess;
|
||||
|
@ -308,11 +307,6 @@ public class BlockHook extends Block implements Rotatable
|
|||
return true;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {FACING, TRIGGERED, ATTACHED};
|
||||
|
|
|
@ -125,11 +125,6 @@ public abstract class BlockPipe extends Block implements ITileEntityProvider, Di
|
|||
return true;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public final boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public final boolean isMagnetic() {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -15,7 +15,6 @@ import common.properties.Property;
|
|||
import common.properties.PropertyEnum;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.DirectionVec;
|
||||
import common.util.Facing;
|
||||
import common.util.HitPosition;
|
||||
|
@ -158,11 +157,6 @@ public class BlockRail extends Block
|
|||
return 0;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public void onRemoved(AWorldServer worldIn, BlockPos pos, State state)
|
||||
{
|
||||
super.onRemoved(worldIn, pos, state);
|
||||
|
|
|
@ -15,7 +15,6 @@ import common.properties.PropertyBool;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.world.IBlockAccess;
|
||||
import common.world.IWorldAccess;
|
||||
|
@ -65,11 +64,6 @@ public class BlockString extends Block
|
|||
return false;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public void onAdded(AWorldServer worldIn, BlockPos pos, State state)
|
||||
{
|
||||
this.notifyHook(worldIn, pos, state);
|
||||
|
|
|
@ -16,7 +16,6 @@ import common.model.GuiPosition;
|
|||
import common.properties.Property;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.HitPosition;
|
||||
import common.util.Vec3;
|
||||
|
@ -219,11 +218,6 @@ public abstract class BlockTorch extends Block implements Directional
|
|||
return super.rayTrace(worldIn, pos, start, end);
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {FACING};
|
||||
|
|
|
@ -17,7 +17,6 @@ import common.properties.PropertyBool;
|
|||
import common.rng.Random;
|
||||
import common.util.BlockPos;
|
||||
import common.util.BoundingBox;
|
||||
import common.util.Clientside;
|
||||
import common.util.Facing;
|
||||
import common.util.Serverside;
|
||||
import common.world.IBlockAccess;
|
||||
|
@ -117,11 +116,6 @@ public class BlockWire extends Block
|
|||
return state.getBlock() == this;
|
||||
}
|
||||
|
||||
@Clientside
|
||||
public boolean hasTransparency() {
|
||||
return true;
|
||||
}
|
||||
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new Property[] {DOWN, UP, NORTH, EAST, SOUTH, WEST};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue