Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
DRKV333 committed Sep 5, 2017
2 parents 1f1d5b4 + 84812c0 commit 1762b22
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
8 changes: 6 additions & 2 deletions MechTransfer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -220,16 +220,18 @@ private void LoadAdapters()
//Omni turret
OmniTurretAdapter omniTurretAdapter = new OmniTurretAdapter(this);
Call(registerAdapterReflection, omniTurretAdapter, new int[] { TileType<OmniTurretTile>() });
}

//Chest
//This needs to be called from SetupRecipies, because chests are made in SetupContent.
private void LoadChestAdapters()
{
ChestAdapter chestAdapter = new ChestAdapter();
List<int> chestTypes = new List<int>();
for (int i = 0; i < TileLoader.TileCount; i++)
{
if (TileID.Sets.BasicChest[i] || TileID.Sets.BasicChestFake[i] || TileLoader.IsDresser(i))
{
chestTypes.Add(i);
continue;
}
}
Call(registerAdapterReflection, chestAdapter, chestTypes.ToArray());
Expand Down Expand Up @@ -339,6 +341,8 @@ public override void AddRecipes()
r.AddTile(TileID.LunarCraftingStation);
r.SetResult(ItemType("MatterProjectorItem"), 1);
r.AddRecipe();

LoadChestAdapters();
}

private void LoadItems()
Expand Down
6 changes: 5 additions & 1 deletion build.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
author = DRKV
version = 1.4
version = 1.4.1
displayName = MechTransfer
includePDB = false
buildIgnore = .gitignore, description.txt, *.csproj*, *.sln, .git/*, .vs/*, bin/*, obj/*, *.xcf
hideCode = false
hideResources = false
includeSource = true
homepage = https://forums.terraria.org/index.php?threads/mechtransfer-item-translocation-and-more.60571/
11 changes: 10 additions & 1 deletion description.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,13 @@ v1.2.1
v1.3
- Support for Snowball launcher, Etherian crystal stand, Cannons and Weapon racks
- Inlet no longer picks up hearts and similar items
- Multiplayer fixes
- Multiplayer fixes

v1.4
- Added visualization for transfers
- Added Omni turret, Super omni turret and Matter projector
- Added support for dressers
- Added reflection based adapter loading

v1.4.1
- Fixed modded chest support

0 comments on commit 1762b22

Please sign in to comment.