Core - Add 'additionalMapiconsData.json'

This commit is contained in:
miku-666
2025-11-20 01:27:16 +01:00
parent 025aafa7b8
commit f0d6b77447
6 changed files with 145 additions and 112 deletions

View File

@@ -201,6 +201,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="Resources\additionalMapiconsData.json" />
<None Include="Resources\bannerData.json" />
<None Include="Resources\blockData.json" />
<None Include="Resources\Comparison.png" />

View File

@@ -70,6 +70,39 @@ namespace PckStudio.Core.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to {
/// &quot;COMMENT_1&quot;: &quot;JSON by MattNL&quot;,
/// &quot;entries&quot;: [
/// {
/// &quot;internalName&quot;: &quot;player_1_off_map&quot;,
/// &quot;displayName&quot;: &quot;Player 1 (Off Map)&quot;
/// },
/// {
/// &quot;internalName&quot;: &quot;player_2_off_map&quot;,
/// &quot;displayName&quot;: &quot;Player 2 (Off Map)&quot;
/// },
/// {
/// &quot;internalName&quot;: &quot;player_3_off_map&quot;,
/// &quot;displayName&quot;: &quot;Player 3 (Off Map)&quot;
/// },
/// {
/// &quot;internalName&quot;: &quot;player_4_off_map&quot;,
/// &quot;displayName&quot;: &quot;Player 4 (Off Map)&quot;
/// },
/// {
/// &quot;internalName&quot;: &quot;treasure&quot;,
/// &quot;displayName&quot;: &quot;Buried Treasure&quot;
/// },
/// {
/// &quot;interna [rest of string was truncated]&quot;;.
/// </summary>
public static string additionalMapiconsData {
get {
return ResourceManager.GetString("additionalMapiconsData", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {
/// &quot;COMMENT_1&quot;: &quot;JSON by MattNL&quot;,
@@ -77,7 +110,7 @@ namespace PckStudio.Core.Properties {
/// {
/// &quot;internalName&quot;: &quot;base&quot;,
/// &quot;displayName&quot;: &quot;Base&quot;,
/// &quot;hasColourEntry&quot;: true,
///
/// &quot;colourEntry&quot;: {
/// &quot;defaultName&quot;: &quot;Banner_White&quot;,
/// &quot;variants&quot;: [
@@ -94,7 +127,8 @@ namespace PckStudio.Core.Properties {
/// &quot;Banner_Pink&quot;,
/// &quot;Banner_Purple&quot;,
/// &quot;Banner_Red&quot;,
/// &quot;Ban [rest of string was truncated]&quot;;.
/// &quot;Banner_Silver&quot;,
/// &quot;Banner [rest of string was truncated]&quot;;.
/// </summary>
public static string bannerData {
get {
@@ -120,7 +154,7 @@ namespace PckStudio.Core.Properties {
/// {
/// &quot;internalName&quot;: &quot;grass_top&quot;,
/// &quot;displayName&quot;: &quot;Grass Block (Top)&quot;,
/// &quot;hasColourEntry&quot;: true,
///
/// &quot;colourEntry&quot;: {
/// &quot;defaultName&quot;: &quot;Grass_Common&quot;,
/// &quot;variants&quot;: [
@@ -136,7 +170,8 @@ namespace PckStudio.Core.Properties {
/// &quot;displayName&quot;: &quot;Stone&quot;
/// },
/// {
/// &quot;internalName&quot;: [rest of string was truncated]&quot;;.
/// &quot;internalName&quot;: &quot;dirt&quot;,
/// &quot;displayName&quot; [rest of string was truncated]&quot;;.
/// </summary>
public static string blockData {
get {
@@ -407,29 +442,26 @@ namespace PckStudio.Core.Properties {
/// <summary>
/// Looks up a localized string similar to {
/// &quot;COMMENT_1&quot;: &quot;JSON by MattNL&quot;,
/// &quot;entries&quot;: [
/// {
/// &quot;internalName&quot;: &quot;generic_0&quot;,
/// &quot;displayName&quot;: &quot;Generic (Stage 1)&quot;,
/// &quot;hasColourEntry&quot;: true,
/// &quot;colourEntry&quot;: {
/// &quot;defaultName&quot;: &quot;None&quot;,
/// &quot;variants&quot;: [
/// &quot;None&quot;,
/// &quot;Particle_Smoke&quot;,
/// &quot;Particle_NetherPortal&quot;,
/// &quot;Particle_EnderPortal&quot;,
/// &quot;Particle_Ender&quot;,
/// &quot;Particle_DragonBreathMin&quot;,
/// &quot;Particle_DragonBreathMax&quot;
/// ]
/// }
/// },
/// {
/// &quot;internalName&quot;: &quot;generic_1&quot;,
/// &quot;displayName&quot;: &quot;Generic (Stage 2)&quot;,
/// [rest of string was truncated]&quot;;.
/// &quot;COMMENT_1&quot;: &quot;JSON by MattNL&quot;,
/// &quot;entries&quot;: [
/// {
/// &quot;internalName&quot;: &quot;generic_0&quot;,
/// &quot;displayName&quot;: &quot;Generic (Stage 1)&quot;,
/// &quot;colourEntry&quot;: {
/// &quot;defaultName&quot;: &quot;None&quot;,
/// &quot;variants&quot;: [
/// &quot;None&quot;,
/// &quot;Particle_Smoke&quot;,
/// &quot;Particle_NetherPortal&quot;,
/// &quot;Particle_EnderPortal&quot;,
/// &quot;Particle_Ender&quot;,
/// &quot;Particle_DragonBreathMin&quot;,
/// &quot;Particle_DragonBreathMax&quot;
/// ]
/// }
/// },
/// {
/// &quot;internalName&quot;: &quot;generic_1&quot;, [rest of string was truncated]&quot;;.
/// </summary>
public static string particleData {
get {

View File

@@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="additionalMapiconsData" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\additionalMapiconsData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
</data>
<data name="additional_map_icons_atlas" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\additional_mapicons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>

View File

@@ -0,0 +1,70 @@
{
"COMMENT_1": "JSON by MattNL",
"entries": [
{
"internalName": "player_1_off_map",
"displayName": "Player 1 (Off Map)"
},
{
"internalName": "player_2_off_map",
"displayName": "Player 2 (Off Map)"
},
{
"internalName": "player_3_off_map",
"displayName": "Player 3 (Off Map)"
},
{
"internalName": "player_4_off_map",
"displayName": "Player 4 (Off Map)"
},
{
"internalName": "treasure",
"displayName": "Buried Treasure"
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "player_5_off_map",
"displayName": "Player 5 (Off Map)"
},
{
"internalName": "player_6_off_map",
"displayName": "Player 6 (Off Map)"
},
{
"internalName": "player_7_off_map",
"displayName": "Player 7 (Off Map)"
},
{
"internalName": "player_8_off_map",
"displayName": "Player 8 (Off Map)"
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
}
]
}

View File

@@ -65,71 +65,5 @@
"internalName": "monument",
"displayName": "Ocean Monument (Explorer Map)"
}
],
"additional_entries": [
{
"internalName": "player_1_off_map",
"displayName": "Player 1 (Off Map)"
},
{
"internalName": "player_2_off_map",
"displayName": "Player 2 (Off Map)"
},
{
"internalName": "player_3_off_map",
"displayName": "Player 3 (Off Map)"
},
{
"internalName": "player_4_off_map",
"displayName": "Player 4 (Off Map)"
},
{
"internalName": "treasure",
"displayName": "Buried Treasure"
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "player_5_off_map",
"displayName": "Player 5 (Off Map)"
},
{
"internalName": "player_6_off_map",
"displayName": "Player 6 (Off Map)"
},
{
"internalName": "player_7_off_map",
"displayName": "Player 7 (Off Map)"
},
{
"internalName": "player_8_off_map",
"displayName": "Player 8 (Off Map)"
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
},
{
"internalName": "",
"displayName": ""
}
]
}
}

View File

@@ -14,34 +14,27 @@ namespace PckStudio.Json
{
[JsonProperty("entries")]
public List<JsonTileInfo> Entries { get; set; }
[JsonProperty("additional_entries")]
public List<JsonTileInfo> AdditionalEntries { get; set; }
}
public static class Tiles
{
private static JsonTiles
_jsonBlockData, _jsonItemData,
_jsonParticleData, _jsonMoonPhaseData,
_jsonMapIconData, _jsonExplosionData,
_jsonExperienceOrbData, _jsonPaintingData, _jsonBannerData;
public static JsonTiles JsonBlockData => _jsonBlockData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.blockData);
public static JsonTiles JsonItemData => _jsonItemData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.itemData);
public static JsonTiles JsonParticleData => _jsonParticleData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.particleData);
public static JsonTiles JsonMoonPhaseData => _jsonMoonPhaseData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.moonPhaseData);
public static JsonTiles JsonMapIconData => _jsonMapIconData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.mapIconData);
public static JsonTiles JsonExplosionData => _jsonExplosionData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.explosionData);
public static JsonTiles JsonExperienceOrbData => _jsonExperienceOrbData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.experienceOrbData);
public static JsonTiles JsonPaintingData => _jsonPaintingData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.paintingData);
public static JsonTiles JsonBannerData => _jsonBannerData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.bannerData);
public static JsonTiles JsonBlockData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.blockData);
public static JsonTiles JsonItemData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.itemData);
public static JsonTiles JsonParticleData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.particleData);
public static JsonTiles JsonMoonPhaseData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.moonPhaseData);
public static JsonTiles JsonMapIconData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.mapIconData);
public static JsonTiles JsonAdditionalMapIconData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.additionalMapiconsData);
public static JsonTiles JsonExplosionData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.explosionData);
public static JsonTiles JsonExperienceOrbData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.experienceOrbData);
public static JsonTiles JsonPaintingData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.paintingData);
public static JsonTiles JsonBannerData { get; } = JsonConvert.DeserializeObject<JsonTiles>(Resources.bannerData);
public static List<JsonTileInfo> ItemTileInfos => JsonItemData.Entries;
public static List<JsonTileInfo> BlockTileInfos => JsonBlockData.Entries;
public static List<JsonTileInfo> ParticleTileInfos => JsonParticleData.Entries;
public static List<JsonTileInfo> MoonPhaseTileInfos => JsonMoonPhaseData.Entries;
public static List<JsonTileInfo> MapIconTileInfos => JsonMapIconData.Entries;
public static List<JsonTileInfo> AdditionalMapIconTileInfos => JsonMapIconData.AdditionalEntries;
public static List<JsonTileInfo> AdditionalMapIconTileInfos => JsonAdditionalMapIconData.Entries;
public static List<JsonTileInfo> ExperienceOrbTileInfos => JsonExperienceOrbData.Entries;
public static List<JsonTileInfo> ExplosionTileInfos => JsonExplosionData.Entries;
public static List<JsonTileInfo> PaintingTileInfos => JsonPaintingData.Entries;