LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-07-06 09:28:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made all atlas types uniform

Browse Source
This commit is contained in:
MattN-L
2024-03-15 22:16:02 -04:00
parent c2fe826a06
commit ae74ed7d14
9 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
PCK-Studio/Internal/Json/Tiles.cs
View File

@@ -13,32 +13,11 @@ namespace PckStudio.Internal.Json
{
internal class JsonTiles
{
[JsonProperty("blocks")]
public List<JsonTileInfo> Blocks { get; set; }
[JsonProperty("items")]
public List<JsonTileInfo> Items { get; set; }
[JsonProperty("entries")]
public List<JsonTileInfo> Entries { get; set; }
[JsonProperty("particles")]
public List<JsonTileInfo> Particles { get; set; }
[JsonProperty("moon_phases")]
public List<JsonTileInfo> MoonPhases { get; set; }
[JsonProperty("map_icons")]
public List<JsonTileInfo> MapIcons { get; set; }
[JsonProperty("additional_map_icons")]
public List<JsonTileInfo> AdditionalMapIcons { get; set; }
[JsonProperty("experience_orbs")]
public List<JsonTileInfo> ExperienceOrbs { get; set; }
[JsonProperty("explosions")]
public List<JsonTileInfo> Explosions { get; set; }
[JsonProperty("paintings")]
public List<JsonTileInfo> Paintings { get; set; }
[JsonProperty("additional_entries")]
public List<JsonTileInfo> AdditionalEntries { get; set; }
}
internal static class Tiles
@@ -57,15 +36,16 @@ namespace PckStudio.Internal.Json
internal static JsonTiles JsonExperienceOrbData => _jsonExperienceOrbData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.experienceOrbData);
internal static JsonTiles JsonPaintingData => _jsonPaintingData ??= JsonConvert.DeserializeObject<JsonTiles>(Resources.paintingData);
internal static List<JsonTileInfo> ItemTileInfos => JsonItemData.Items;
internal static List<JsonTileInfo> BlockTileInfos => JsonBlockData.Blocks;
internal static List<JsonTileInfo> ParticleTileInfos => JsonParticleData.Particles;
internal static List<JsonTileInfo> MoonPhaseTileInfos => JsonMoonPhaseData.MoonPhases;
internal static List<JsonTileInfo> MapIconTileInfos => JsonMapIconData.MapIcons;
internal static List<JsonTileInfo> AdditionalMapIconTileInfos => JsonMapIconData.AdditionalMapIcons;
internal static List<JsonTileInfo> ExperienceOrbTileInfos => JsonExperienceOrbData.ExperienceOrbs;
internal static List<JsonTileInfo> ExplosionTileInfos => JsonExplosionData.Explosions;
internal static List<JsonTileInfo> PaintingTileInfos => JsonPaintingData.Paintings;
internal static List<JsonTileInfo> ItemTileInfos => JsonItemData.Entries;
internal static List<JsonTileInfo> BlockTileInfos => JsonBlockData.Entries;
internal static List<JsonTileInfo> ParticleTileInfos => JsonParticleData.Entries;
internal static List<JsonTileInfo> MoonPhaseTileInfos => JsonMoonPhaseData.Entries;
internal static List<JsonTileInfo> MapIconTileInfos => JsonMapIconData.Entries;
internal static List<JsonTileInfo> AdditionalMapIconTileInfos => JsonMapIconData.AdditionalEntries;
internal static List<JsonTileInfo> ExperienceOrbTileInfos => JsonExperienceOrbData.Entries;
internal static List<JsonTileInfo> ExplosionTileInfos => JsonExplosionData.Entries;
internal static List<JsonTileInfo> PaintingTileInfos => JsonPaintingData.Entries;
internal static List<JsonTileInfo> BannerTileInfos => JsonPaintingData.Entries;
private static Image[] _itemImages;
public static Image[] ItemImages => _itemImages ??= Resources.items_atlas.SplitHorizontal(16).ToArray();

2
PCK-Studio/Resources/atlases/blockData.json
View File

@@ -1,7 +1,7 @@
{
"COMMENT_1": "Tile data research by MattNL",
"COMMENT_2": "JSON by PhoenixARC, MattNL, and NessieHax (Miku-666)",
"blocks": [
"entries": [
{
"internalName": "grass_top",
"displayName": "Grass Block (Top)",

2
PCK-Studio/Resources/atlases/experienceOrbData.json
View File

@@ -1,6 +1,6 @@
{
"COMMENT_1": "JSON by MattNL",
"experience_orbs": [
"entries": [
{
"internalName": "experience_orb_0",
"displayName": "Experience Orb (Size 1)",

2
PCK-Studio/Resources/atlases/explosionData.json
View File

@@ -1,6 +1,6 @@
{
"COMMENT_1": "JSON by MattNL",
"explosions": [
"entries": [
{
"internalName": "explosion_0",
"displayName": "Explosion (Stage 1)",

2
PCK-Studio/Resources/atlases/itemData.json
View File

@@ -1,7 +1,7 @@
{
"COMMENT_1": "Tile data research by MattNL",
"COMMENT_2": "JSON by PhoenixARC, MattNL, and NessieHax (Miku-666)",
"items": [
"entries": [
{
"internalName": "helmetCloth",
"displayName": "Leather Cap",

4
PCK-Studio/Resources/atlases/mapIconData.json
View File

@@ -1,6 +1,6 @@
{
"COMMENT_1": "JSON by MattNL",
"map_icons": [
"entries": [
{
"internalName": "player_1",
"displayName": "Player 1"
@@ -66,7 +66,7 @@
"displayName": "Ocean Monument (Explorer Map)"
}
],
"additional_map_icons": [
"additional_entries": [
{
"internalName": "player_1_off_map",
"displayName": "Player 1 (Off Map)"

2
PCK-Studio/Resources/atlases/moonPhaseData.json
View File

@@ -1,6 +1,6 @@
{
"COMMENT_1": "JSON by MattNL",
"moon_phases": [
"entries": [
{
"internalName": "moon_phase_0",
"displayName": "Full Moon"

2
PCK-Studio/Resources/atlases/paintingData.json
View File

@@ -1,6 +1,6 @@
{
"COMMENT_1": "JSON by MattNL",
"paintings": [
"entries": [
{
"internalName": "Kebab",
"displayName": "\"Kebab med tre pepperoni\" by Kristoffer Zetterstrand"

2
PCK-Studio/Resources/atlases/particleData.json
View File

@@ -1,6 +1,6 @@
{
"COMMENT_1": "JSON by MattNL",
"particles": [
"entries": [
{
"internalName": "generic_0",
"displayName": "Generic (Stage 1)",