Skip to content

Commit 1d4d8a3

Browse files
author
Zack Piispanen
committed
Build with latest release 4.2.9.
Fix up some warnings.
1 parent f562452 commit 1d4d8a3

4 files changed

Lines changed: 82 additions & 80 deletions

File tree

‎InvincibleTiles/DLL/TShockAPI.dll‎

0 Bytes
Binary file not shown.

‎InvincibleTiles/DLL/TerrariaServer.exe‎

0 Bytes
Binary file not shown.

‎InvincibleTiles/InvincibleTiles.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private void SetupDb()
8484
}
8585
catch (MySqlException ex)
8686
{
87-
Log.Error(ex.ToString());
87+
TShock.Log.Error(ex.ToString());
8888
throw new Exception("MySql not setup correctly");
8989
}
9090
}
@@ -101,7 +101,7 @@ private void SetupDb()
101101
db.GetSqlType() == SqlType.Sqlite
102102
? (IQueryBuilder)new SqliteQueryCreator()
103103
: new MysqlQueryCreator());
104-
creator2.EnsureExists(table2);
104+
creator2.EnsureTableStructure(table2);
105105
}
106106

107107
private void ReadDb()
@@ -154,7 +154,7 @@ private void AddTile(CommandArgs args)
154154

155155
if(db.Query(query, id,0) != 1)
156156
{
157-
Log.ConsoleError("Inserting into the database has failed!");
157+
TShock.Log.ConsoleError("Inserting into the database has failed!");
158158
args.Player.SendMessage(String.Format("Inserting into the database has failed!", id), Color.Red);
159159
}
160160
else
@@ -182,7 +182,7 @@ private void DelTile(CommandArgs args)
182182

183183
if (db.Query(query, id, 0) != 1)
184184
{
185-
Log.ConsoleError("Removing from the database has failed!");
185+
TShock.Log.ConsoleError("Removing from the database has failed!");
186186
args.Player.SendMessage(String.Format("Removing from the database has failed! Are you sure {0} is banned?", id), Color.Red);
187187
}
188188
else
@@ -211,7 +211,7 @@ private void AddWall(CommandArgs args)
211211

212212
if (db.Query(query, id, 1) != 1)
213213
{
214-
Log.ConsoleError("Inserting into the database has failed!");
214+
TShock.Log.ConsoleError("Inserting into the database has failed!");
215215
args.Player.SendMessage(String.Format("Inserting into the database has failed!", id), Color.Red);
216216
}
217217
else
@@ -239,7 +239,7 @@ private void DelWall(CommandArgs args)
239239

240240
if (db.Query(query, id, 1) != 1)
241241
{
242-
Log.ConsoleError("Removing from the database has failed!");
242+
TShock.Log.ConsoleError("Removing from the database has failed!");
243243
args.Player.SendMessage(String.Format("Removing from the database has failed! Are you sure {0} is banned?", id), Color.Red);
244244
}
245245
else

‎InvincibleTiles/InvincibleTiles.csproj‎

Lines changed: 76 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,83 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{A1298557-451B-4A8A-8FAC-6706C86C6DE8}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>InvincibleTiles</RootNamespace>
12-
<AssemblyName>InvincibleTiles</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14-
<FileAlignment>512</FileAlignment>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="Community.CsharpSqlite">
35-
<HintPath>DLL\Community.CsharpSqlite.dll</HintPath>
36-
</Reference>
37-
<Reference Include="Community.CsharpSqlite.SQLiteClient">
38-
<HintPath>DLL\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
39-
</Reference>
40-
<Reference Include="Mono.Data.Sqlite">
41-
<HintPath>DLL\Mono.Data.Sqlite.dll</HintPath>
42-
</Reference>
43-
<Reference Include="MySql.Data">
44-
<HintPath>DLL\MySql.Data.dll</HintPath>
45-
</Reference>
46-
<Reference Include="MySql.Web">
47-
<HintPath>DLL\MySql.Web.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Newtonsoft.Json">
50-
<HintPath>DLL\Newtonsoft.Json.dll</HintPath>
51-
</Reference>
52-
<Reference Include="System" />
53-
<Reference Include="System.Core" />
54-
<Reference Include="System.Xml.Linq" />
55-
<Reference Include="System.Data.DataSetExtensions" />
56-
<Reference Include="Microsoft.CSharp" />
57-
<Reference Include="System.Data" />
58-
<Reference Include="System.Xml" />
59-
<Reference Include="TerrariaServer, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
60-
<SpecificVersion>False</SpecificVersion>
61-
<ExecutableExtension>.exe</ExecutableExtension>
62-
<HintPath>DLL\TerrariaServer.exe</HintPath>
63-
</Reference>
64-
<Reference Include="TShockAPI, Version=3.6.0.204, Culture=neutral, processorArchitecture=MSIL">
65-
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>DLL\TShockAPI.dll</HintPath>
67-
</Reference>
68-
</ItemGroup>
69-
<ItemGroup>
70-
<Compile Include="InvincibleTiles.cs" />
71-
<Compile Include="Properties\AssemblyInfo.cs" />
72-
</ItemGroup>
73-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{A1298557-451B-4A8A-8FAC-6706C86C6DE8}</ProjectGuid>
9+
<OutputType>Library</OutputType>
10+
<AppDesignerFolder>Properties</AppDesignerFolder>
11+
<RootNamespace>InvincibleTiles</RootNamespace>
12+
<AssemblyName>InvincibleTiles</AssemblyName>
13+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
14+
<FileAlignment>512</FileAlignment>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<DebugSymbols>true</DebugSymbols>
18+
<DebugType>full</DebugType>
19+
<Optimize>false</Optimize>
20+
<OutputPath>bin\Debug\</OutputPath>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
<ErrorReport>prompt</ErrorReport>
23+
<WarningLevel>4</WarningLevel>
24+
<PlatformTarget>x86</PlatformTarget>
25+
</PropertyGroup>
26+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27+
<DebugType>pdbonly</DebugType>
28+
<Optimize>true</Optimize>
29+
<OutputPath>bin\Release\</OutputPath>
30+
<DefineConstants>TRACE</DefineConstants>
31+
<ErrorReport>prompt</ErrorReport>
32+
<WarningLevel>4</WarningLevel>
33+
<PlatformTarget>x86</PlatformTarget>
34+
</PropertyGroup>
35+
<ItemGroup>
36+
<Reference Include="Community.CsharpSqlite">
37+
<HintPath>DLL\Community.CsharpSqlite.dll</HintPath>
38+
</Reference>
39+
<Reference Include="Community.CsharpSqlite.SQLiteClient">
40+
<HintPath>DLL\Community.CsharpSqlite.SQLiteClient.dll</HintPath>
41+
</Reference>
42+
<Reference Include="Mono.Data.Sqlite">
43+
<HintPath>DLL\Mono.Data.Sqlite.dll</HintPath>
44+
</Reference>
45+
<Reference Include="MySql.Data">
46+
<HintPath>DLL\MySql.Data.dll</HintPath>
47+
</Reference>
48+
<Reference Include="MySql.Web">
49+
<HintPath>DLL\MySql.Web.dll</HintPath>
50+
</Reference>
51+
<Reference Include="Newtonsoft.Json">
52+
<HintPath>DLL\Newtonsoft.Json.dll</HintPath>
53+
</Reference>
54+
<Reference Include="System" />
55+
<Reference Include="System.Core" />
56+
<Reference Include="System.Xml.Linq" />
57+
<Reference Include="System.Data.DataSetExtensions" />
58+
<Reference Include="Microsoft.CSharp" />
59+
<Reference Include="System.Data" />
60+
<Reference Include="System.Xml" />
61+
<Reference Include="TerrariaServer, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
62+
<SpecificVersion>False</SpecificVersion>
63+
<ExecutableExtension>.exe</ExecutableExtension>
64+
<HintPath>DLL\TerrariaServer.exe</HintPath>
65+
</Reference>
66+
<Reference Include="TShockAPI, Version=3.6.0.204, Culture=neutral, processorArchitecture=MSIL">
67+
<SpecificVersion>False</SpecificVersion>
68+
<HintPath>DLL\TShockAPI.dll</HintPath>
69+
</Reference>
70+
</ItemGroup>
71+
<ItemGroup>
72+
<Compile Include="InvincibleTiles.cs" />
73+
<Compile Include="Properties\AssemblyInfo.cs" />
74+
</ItemGroup>
75+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7476
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7577
Other similar extension points exist, see Microsoft.Common.targets.
7678
<Target Name="BeforeBuild">
7779
</Target>
7880
<Target Name="AfterBuild">
7981
</Target>
80-
-->
82+
-->
8183
</Project>

0 commit comments

Comments
 (0)