Skip to content

Commit 1762b22

Browse files
committed
Merge branch 'develop'
2 parents 1f1d5b4 + 84812c0 commit 1762b22

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

MechTransfer.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,18 @@ private void LoadAdapters()
220220
//Omni turret
221221
OmniTurretAdapter omniTurretAdapter = new OmniTurretAdapter(this);
222222
Call(registerAdapterReflection, omniTurretAdapter, new int[] { TileType<OmniTurretTile>() });
223+
}
223224

224-
//Chest
225+
//This needs to be called from SetupRecipies, because chests are made in SetupContent.
226+
private void LoadChestAdapters()
227+
{
225228
ChestAdapter chestAdapter = new ChestAdapter();
226229
List<int> chestTypes = new List<int>();
227230
for (int i = 0; i < TileLoader.TileCount; i++)
228231
{
229232
if (TileID.Sets.BasicChest[i] || TileID.Sets.BasicChestFake[i] || TileLoader.IsDresser(i))
230233
{
231234
chestTypes.Add(i);
232-
continue;
233235
}
234236
}
235237
Call(registerAdapterReflection, chestAdapter, chestTypes.ToArray());
@@ -339,6 +341,8 @@ public override void AddRecipes()
339341
r.AddTile(TileID.LunarCraftingStation);
340342
r.SetResult(ItemType("MatterProjectorItem"), 1);
341343
r.AddRecipe();
344+
345+
LoadChestAdapters();
342346
}
343347

344348
private void LoadItems()

build.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
author = DRKV
2-
version = 1.4
2+
version = 1.4.1
33
displayName = MechTransfer
44
includePDB = false
5+
buildIgnore = .gitignore, description.txt, *.csproj*, *.sln, .git/*, .vs/*, bin/*, obj/*, *.xcf
6+
hideCode = false
7+
hideResources = false
8+
includeSource = true
59
homepage = https://forums.terraria.org/index.php?threads/mechtransfer-item-translocation-and-more.60571/

description.txt

+10-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,13 @@ v1.2.1
3333
v1.3
3434
- Support for Snowball launcher, Etherian crystal stand, Cannons and Weapon racks
3535
- Inlet no longer picks up hearts and similar items
36-
- Multiplayer fixes
36+
- Multiplayer fixes
37+
38+
v1.4
39+
- Added visualization for transfers
40+
- Added Omni turret, Super omni turret and Matter projector
41+
- Added support for dressers
42+
- Added reflection based adapter loading
43+
44+
v1.4.1
45+
- Fixed modded chest support

0 commit comments

Comments
 (0)