Skip to content

Commit

Permalink
#209 Remove redudant code
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gallimathias
Gallimathias committed Dec 28, 2017
1 parent 0c48098 commit 8df47f1
Show file tree
Hide file tree
Showing 11 changed files with 225 additions and 559 deletions.
160 changes: 39 additions & 121 deletions OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/BirchWoodBlockDefinition.cs
View file
Expand Up @@ -9,45 +9,31 @@ namespace OctoAwesome.Basics.Definitions.Blocks
{
public sealed class BirchWoodBlockDefinition : BlockDefinition
{
public override string Name
{
get { return Languages.OctoBasics.BirchWood; }
}
public override string Name => Languages.OctoBasics.BirchWood;

public override string Icon
{
get { return "birch_wood_top"; }
}
public override string Icon => "birch_wood_top";

public override bool HasMetaData { get { return true; } }
public override bool HasMetaData => true;

public override string[] Textures
{
get
{
return new[] {
public override string[] Textures => new[] {
"birch_wood_top",
"birch_wood_side" };
}
}

public override PhysicalProperties GetProperties(ILocalChunkCache manager, int x, int y, int z)
{
return new PhysicalProperties()
=> new PhysicalProperties()
{
Density = 0.87f,
FractureToughness = 0.3f,
Granularity = 0.9f,
Hardness = 0.1f
};
}

public override void Hit(IBlockDefinition block, PhysicalProperties itemProperties)
{
throw new NotImplementedException();
}

public override int GetTextureIndex (Wall wall, ILocalChunkCache manager,
public override int GetTextureIndex(Wall wall, ILocalChunkCache manager,
int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);
Expand Down Expand Up @@ -113,111 +99,43 @@ public override void Hit(IBlockDefinition block, PhysicalProperties itemProperti
return -1;
}

public override int GetTopTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetBottomTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetEastTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
return 1;
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetWestTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
return 1;
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetNorthTextureRotation(ILocalChunkCache manager, int x, int y, int z)
public override int GetTextureRotation(Wall wall, ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetSouthTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
switch (wall)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
case Wall.Top:
case Wall.Bottom:
case Wall.Back:
case Wall.Front:
switch (orientation)//top and bottom north south
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
case Wall.Left:
case Wall.Right:
switch (orientation) //east west
{
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
return 1;
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
default:
return 0;
return base.GetTextureRotation(wall, manager, x, y, z); //should never ever happen
}
}
}
Expand Down
150 changes: 36 additions & 114 deletions OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/CactusBlockDefinition.cs
View file
Expand Up @@ -8,27 +8,15 @@ namespace OctoAwesome.Basics.Definitions.Blocks
{
public class CactusBlockDefinition : BlockDefinition
{
public override string Icon
{
get { return "cactus_inside"; }
}
public override string Icon => "cactus_inside";

public override string Name
{
get { return Languages.OctoBasics.Cactus; }
}
public override string Name => Languages.OctoBasics.Cactus;

public override string[] Textures
{
get
{
return new[] {
public override string[] Textures => new[] {
"cactus_inside",
"cactus_side",
"cactus_top"
};
}
}

public override int GetTextureIndex(Wall wall, ILocalChunkCache manager,
int x, int y, int z)
Expand Down Expand Up @@ -167,111 +155,45 @@ public override string[] Textures
return -1;
}

public override int GetTopTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetBottomTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetEastTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
return 1;
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetWestTextureRotation(ILocalChunkCache manager, int x, int y, int z)
public override int GetTextureRotation(Wall wall, ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
return 1;
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetNorthTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
}

public override int GetSouthTextureRotation(ILocalChunkCache manager, int x, int y, int z)
{
OrientationFlags orientation = (OrientationFlags)manager.GetBlockMeta(x, y, z);

switch (orientation)
switch (wall)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
case Wall.Top:
case Wall.Bottom:
case Wall.Back:
case Wall.Front:
switch (orientation)
{
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
return 1;
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
case Wall.Left:
case Wall.Right:
switch (orientation)
{
case OrientationFlags.SideSouth:
case OrientationFlags.SideNorth:
return 1;
case OrientationFlags.SideWest:
case OrientationFlags.SideEast:
case OrientationFlags.SideBottom:
case OrientationFlags.SideTop:
default:
return 0;
}
default:
return 0;
return base.GetTextureRotation(wall, manager, x, y, z); //should never ever happen
}
}

Expand Down

0 comments on commit 8df47f1

Please sign in to comment.