Skip to content

Commit

Permalink
XAML removed, JSON used instead
Browse files Browse the repository at this point in the history
More refactoring
  • Loading branch information
andreabenetton committed Mar 12, 2020
1 parent 09c9945 commit 2b466d8
Show file tree
Hide file tree
Showing 517 changed files with 13,107 additions and 14,535 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ TestResults/
*.psess
*.vsp
packages/
.vs/

config.yaml

Expand Down
Binary file modified .vs/TrueCraft/v16/Server/sqlite3/storage.ide
Binary file not shown.
1 change: 0 additions & 1 deletion Test.TrueCraft.Core/Test.TrueCraft.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
<HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
Expand Down
3 changes: 1 addition & 2 deletions Test.TrueCraft.Core/Windows/CraftingWindowAreaTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ public void TestCraftingWindowArea()
var repository = new Mock<ICraftingRepository>();
repository.Setup(r => r.GetRecipe(It.IsAny<IWindowArea>())).Returns(recipe.Object);

var area = new CraftingWindowArea(repository.Object, 0);
area[0] = new ItemStack(11);
var area = new CraftingWindowArea(repository.Object, 0) {[0] = new ItemStack(11)};
Assert.AreEqual(new ItemStack(10), area[CraftingWindowArea.CraftingOutput]);
}
}
Expand Down
19 changes: 0 additions & 19 deletions Test.TrueCraft.Nbt/Serialization/DynamicConverterTests.cs

This file was deleted.

4 changes: 1 addition & 3 deletions Test.TrueCraft.Nbt/Test.TrueCraft.Nbt.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
<Name>TrueCraft.Nbt</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Serialization\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
4 changes: 2 additions & 2 deletions TrueCraft.API/AI/IMobState.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using TrueCraft.API.Server;
using TrueCraft.API.Entities;
using TrueCraft.API.Entities;
using TrueCraft.API.Server;

namespace TrueCraft.API.AI
{
Expand Down
10 changes: 5 additions & 5 deletions TrueCraft.API/AI/ISpawnRule.cs
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
using TrueCraft.API.World;
using TrueCraft.API.Server;
using TrueCraft.API.Server;
using TrueCraft.API.World;

namespace TrueCraft.API.AI
{
public interface ISpawnRule
{
/// <summary>
/// One in every n chunks will spawn mobs (with randomness mixed in).
/// One in every n chunks will spawn mobs (with randomness mixed in).
/// </summary>
int ChunkSpawnChance { get; }

/// <summary>
/// Spawns mobs on a given chunk immediately after the chunk has been generated.
/// Spawns mobs on a given chunk immediately after the chunk has been generated.
/// </summary>
void GenerateMobs(IChunk chunk, IEntityManager entityManager);

/// <summary>
/// Spawns mobs as part of the ongoing spawn cycle.
/// Spawns mobs as part of the ongoing spawn cycle.
/// </summary>
void SpawnMobs(IChunk chunk, IEntityManager entityManager);
}
Expand Down
12 changes: 6 additions & 6 deletions TrueCraft.API/ArmorMaterial.cs
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
namespace TrueCraft.API
{
/// <summary>
/// Enumerates the materials armor can be crafted from.
/// Enumerates the materials armor can be crafted from.
/// </summary>
public enum ArmorMaterial
{
/// <summary>
/// The armor is made of leather.
/// The armor is made of leather.
/// </summary>
Leather,

/// <summary>
/// The armor is made of chain (fire).
/// The armor is made of chain (fire).
/// </summary>
Chain,

/// <summary>
/// The armor is made of iron ingots.
/// The armor is made of iron ingots.
/// </summary>
Iron,

/// <summary>
/// The armor is made of gold ingots.
/// The armor is made of gold ingots.
/// </summary>
Gold,

/// <summary>
/// The armor is made of diamonds.
/// The armor is made of diamonds.
/// </summary>
Diamond
}
Expand Down
58 changes: 29 additions & 29 deletions TrueCraft.API/Biome.cs
Original file line number Diff line number Diff line change
@@ -1,118 +1,118 @@
namespace TrueCraft.API
{
/// <summary>
/// Enumerates the biomes in TrueCraft.
/// Enumerates the biomes in TrueCraft.
/// </summary>
/// <remarks>
/// The 13 vanilla b1.7.3 biomes as found on http://b.wiki.vg/json/b1.7
/// The 13 vanilla b1.7.3 biomes as found on http://b.wiki.vg/json/b1.7
/// </remarks>
public enum Biome
{
/// <summary>
/// A plains biome.
/// A plains biome.
/// </summary>
Plains = 0,

/// <summary>
/// A desert biome.
/// A desert biome.
/// </summary>
Desert = 1,

/// <summary>
/// A forest biome.
/// A forest biome.
/// </summary>
Forest = 2,

/// <summary>
/// A rainforest biome.
/// A rainforest biome.
/// </summary>
Rainforest = 3,

/// <summary>
/// A seasonal forest biome.
/// A seasonal forest biome.
/// </summary>
SeasonalForest = 4,

/// <summary>
/// A savanna biome.
/// A savanna biome.
/// </summary>
Savanna = 5,

/// <summary>
/// A shrubland biome.
/// A shrubland biome.
/// </summary>
Shrubland = 6,

/// <summary>
/// A swampland biome.
/// A swampland biome.
/// </summary>
Swampland = 7,

/// <summary>
/// A Nether biome.
/// A Nether biome.
/// </summary>
Hell = 8,

/// <summary>
/// An End biome.
/// An End biome.
/// </summary>
/// <remarks>
/// Implementation into TrueCraft is undetermined at this point
/// Implementation into TrueCraft is undetermined at this point
/// </remarks>
Sky = 9,

/// <summary>
/// A taiga biome.
/// A taiga biome.
/// </summary>
Taiga = 10,

/// <summary>
/// A tundra biome.
/// A tundra biome.
/// </summary>
Tundra = 11,

/// <summary>
/// An ice desert biome.
/// An ice desert biome.
/// </summary>
/// <remarks>
/// Implementation into TrueCraft is undetermined at this point
/// Implementation into TrueCraft is undetermined at this point
/// </remarks>
IceDesert = 12,

//Below are "transitional" biomes/biomes which are not in b1.7.3

/// <summary>
/// An ocean biome.
/// An ocean biome.
/// </summary>
Ocean = 13,

/// <summary>
/// A river biome.
/// A river biome.
/// </summary>
/// <remarks>
/// Implementation into TrueCraft is undetermined at this point
/// Implementation into TrueCraft is undetermined at this point
/// </remarks>
River = 14,

/// <summary>
/// A beach biome.
/// A beach biome.
/// </summary>
/// <remarks>
/// Implementation into TrueCraft is undetermined at this point
/// Implementation into TrueCraft is undetermined at this point
/// </remarks>
Beach = 15,

/// <summary>
/// A frozen ocean biome.
/// A frozen ocean biome.
/// </summary>
FrozenOcean = 16,

/// <summary>
/// A frozen river biome.
/// A frozen river biome.
/// </summary>
/// <remarks>
/// Implementation into TrueCraft is undetermined at this point
/// Implementation into TrueCraft is undetermined at this point
/// </remarks>
FrozenRiver = 17,
FrozenRiver = 17
}
}
}
14 changes: 7 additions & 7 deletions TrueCraft.API/BlockFace.cs
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
namespace TrueCraft.API
{
/// <summary>
/// Enumerates the directions of block faces.
/// Enumerates the directions of block faces.
/// </summary>
public enum BlockFace
{
/// <summary>
/// The block face points towards -Y.
/// The block face points towards -Y.
/// </summary>
NegativeY = 0,

/// <summary>
/// The block face points towards +Y.
/// The block face points towards +Y.
/// </summary>
PositiveY = 1,

/// <summary>
/// The block face points towards -Z.
/// The block face points towards -Z.
/// </summary>
NegativeZ = 2,

/// <summary>
/// The block face points towards +Z.
/// The block face points towards +Z.
/// </summary>
PositiveZ = 3,

/// <summary>
/// The block face points towards -X.
/// The block face points towards -X.
/// </summary>
NegativeX = 4,

/// <summary>
/// The block face points towards +X.
/// The block face points towards +X.
/// </summary>
PositiveX = 5
}
Expand Down
Loading

0 comments on commit 2b466d8

Please sign in to comment.