diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs index f4d36581..ba89eea2 100644 --- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs +++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs @@ -165,7 +165,7 @@ namespace PckStudio.Forms.Editor } } - setColorButton.Enabled = tileInfo.AllowCustomColour; + setColorButton.Enabled = tileInfo.HasColourEntry; variantComboBox.Enabled = variantComboBox.Visible = tileInfo.HasColourEntry && tileInfo.ColourEntry?.Variants?.Length > 1; if (variantComboBox.Enabled) diff --git a/PCK-Studio/Resources/atlases/bannerData.json b/PCK-Studio/Resources/atlases/bannerData.json index 88c3685f..cf9df733 100644 --- a/PCK-Studio/Resources/atlases/bannerData.json +++ b/PCK-Studio/Resources/atlases/bannerData.json @@ -1,5 +1,5 @@ { - "COMMENT_1": "JSON by MattNL", + "COMMENT_1": "JSON by MayNL", "entries": [ { "internalName": "base", diff --git a/PCK-Studio/Resources/atlases/blockData.json b/PCK-Studio/Resources/atlases/blockData.json index 2b9e4550..40831e9c 100644 --- a/PCK-Studio/Resources/atlases/blockData.json +++ b/PCK-Studio/Resources/atlases/blockData.json @@ -1,6 +1,6 @@ { - "COMMENT_1": "Tile data research by MattNL", - "COMMENT_2": "JSON by PhoenixARC, MattNL, and NessieHax (Miku-666)", + "COMMENT_1": "Tile data research by MayNL", + "COMMENT_2": "JSON by PhoenixARC, MayNL, and NessieHax (Miku-666)", "entries": [ { "internalName": "grass_top", @@ -1086,7 +1086,7 @@ }, { "internalName": "water_flow", - "displayName": "" + "displayName": "g" }, { "internalName": "sandstone_bottom", @@ -2317,7 +2317,6 @@ { "internalName": "cauldron_water", "displayName": "Cauldron Water", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Cauldron_Water", diff --git a/PCK-Studio/Resources/atlases/entityBehavioursData.json b/PCK-Studio/Resources/atlases/entityBehavioursData.json index 921fe41f..d30019cd 100644 --- a/PCK-Studio/Resources/atlases/entityBehavioursData.json +++ b/PCK-Studio/Resources/atlases/entityBehavioursData.json @@ -1,5 +1,5 @@ { - "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", + "COMMENT": "Entity data research by NessieHax (Miku-666) and MayNL", "entries": [ { "internalName": "area_effect_cloud", diff --git a/PCK-Studio/Resources/atlases/entityMaterialsData.json b/PCK-Studio/Resources/atlases/entityMaterialsData.json index 259a077b..6d724d8c 100644 --- a/PCK-Studio/Resources/atlases/entityMaterialsData.json +++ b/PCK-Studio/Resources/atlases/entityMaterialsData.json @@ -1,5 +1,5 @@ { - "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", + "COMMENT": "Entity data research by NessieHax (Miku-666) and MayNL", "entries": [ { "internalName": "", diff --git a/PCK-Studio/Resources/atlases/entityModelsData.json b/PCK-Studio/Resources/atlases/entityModelsData.json index 647be99b..5a21f7e2 100644 --- a/PCK-Studio/Resources/atlases/entityModelsData.json +++ b/PCK-Studio/Resources/atlases/entityModelsData.json @@ -1,5 +1,5 @@ { - "COMMENT": "Entity data research by NessieHax (Miku-666) and MattNL", + "COMMENT": "Entity data research by NessieHax (Miku-666) and MayNL", "entries": [ { "internalName": "", diff --git a/PCK-Studio/Resources/atlases/experienceOrbData.json b/PCK-Studio/Resources/atlases/experienceOrbData.json index f83a7ab3..8737e22d 100644 --- a/PCK-Studio/Resources/atlases/experienceOrbData.json +++ b/PCK-Studio/Resources/atlases/experienceOrbData.json @@ -1,5 +1,5 @@ { - "COMMENT_1": "JSON by MattNL", + "COMMENT_1": "JSON by MayNL", "entries": [ { "internalName": "experience_orb_0", diff --git a/PCK-Studio/Resources/atlases/explosionData.json b/PCK-Studio/Resources/atlases/explosionData.json index f9845f7e..23dce97e 100644 --- a/PCK-Studio/Resources/atlases/explosionData.json +++ b/PCK-Studio/Resources/atlases/explosionData.json @@ -1,5 +1,5 @@ { - "COMMENT_1": "JSON by MattNL", + "COMMENT_1": "JSON by MayNL", "entries": [ { "internalName": "explosion_0", diff --git a/PCK-Studio/Resources/atlases/itemData.json b/PCK-Studio/Resources/atlases/itemData.json index 51c380b7..8eb09394 100644 --- a/PCK-Studio/Resources/atlases/itemData.json +++ b/PCK-Studio/Resources/atlases/itemData.json @@ -1,11 +1,10 @@ { - "COMMENT_1": "Tile data research by MattNL", - "COMMENT_2": "JSON by PhoenixARC, MattNL, and NessieHax (Miku-666)", + "COMMENT_1": "Tile data research by MayNL", + "COMMENT_2": "JSON by PhoenixARC, MayNL, and NessieHax (Miku-666)", "entries": [ { "internalName": "helmetCloth", "displayName": "Leather Cap", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Armour_Default_Leather_Colour", @@ -75,7 +74,6 @@ { "internalName": "chestplateCloth", "displayName": "Leather Tunic", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Armour_Default_Leather_Colour", @@ -145,7 +143,6 @@ { "internalName": "leggingsCloth", "displayName": "Leather Pants", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Armour_Default_Leather_Colour", @@ -215,7 +212,6 @@ { "internalName": "bootsCloth", "displayName": "Leather Boots", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Armour_Default_Leather_Colour", @@ -593,7 +589,6 @@ { "internalName": "potion_contents", "displayName": "Potion (Overlay)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1094,7 +1089,6 @@ { "internalName": "leather_horse_armor_base", "displayName": "Leather Horse Armor", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Armour_Default_Leather_Colour", diff --git a/PCK-Studio/Resources/atlases/mapIconData.json b/PCK-Studio/Resources/atlases/mapIconData.json index 8e1273f2..b9648439 100644 --- a/PCK-Studio/Resources/atlases/mapIconData.json +++ b/PCK-Studio/Resources/atlases/mapIconData.json @@ -1,5 +1,5 @@ { - "COMMENT_1": "JSON by MattNL", + "COMMENT_1": "JSON by MayNL", "entries": [ { "internalName": "player_1", diff --git a/PCK-Studio/Resources/atlases/moonPhaseData.json b/PCK-Studio/Resources/atlases/moonPhaseData.json index 506e7f6f..d6e3bcec 100644 --- a/PCK-Studio/Resources/atlases/moonPhaseData.json +++ b/PCK-Studio/Resources/atlases/moonPhaseData.json @@ -1,5 +1,5 @@ { - "COMMENT_1": "JSON by MattNL", + "COMMENT_1": "JSON by MayNL", "entries": [ { "internalName": "moon_phase_0", diff --git a/PCK-Studio/Resources/atlases/paintingData.json b/PCK-Studio/Resources/atlases/paintingData.json index 5b5b0ef9..c165fcda 100644 --- a/PCK-Studio/Resources/atlases/paintingData.json +++ b/PCK-Studio/Resources/atlases/paintingData.json @@ -1,5 +1,5 @@ { - "COMMENT_1": "JSON by MattNL", + "COMMENT_1": "JSON by MayNL", "entries": [ { "internalName": "Kebab", diff --git a/PCK-Studio/Resources/atlases/particleData.json b/PCK-Studio/Resources/atlases/particleData.json index f4dae017..b43fcb72 100644 --- a/PCK-Studio/Resources/atlases/particleData.json +++ b/PCK-Studio/Resources/atlases/particleData.json @@ -1,5 +1,5 @@ { - "COMMENT_1": "JSON by MattNL", + "COMMENT_1": "JSON by MayNL", "entries": [ { "internalName": "generic_0", @@ -301,7 +301,6 @@ "displayName": "Firework Flash", "width": 4, "height": 4, - "allowCustomColour": true }, { "internalName": "flash", @@ -749,7 +748,6 @@ "internalName": "effect_0", "displayName": "Effect (Stage 1)", "hasColourEntry": true, - "allowCustomColour": true, "colourEntry": { "defaultName": "Potion_BaseColour", "variants": [ @@ -789,7 +787,6 @@ "internalName": "effect_1", "displayName": "Effect (Stage 2)", "hasColourEntry": true, - "allowCustomColour": true, "colourEntry": { "defaultName": "Potion_BaseColour", "variants": [ @@ -828,7 +825,6 @@ { "internalName": "effect_2", "displayName": "Effect (Stage 3)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -868,7 +864,6 @@ { "internalName": "effect_3", "displayName": "Effect (Stage 4)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -908,7 +903,6 @@ { "internalName": "effect_4", "displayName": "Effect (Stage 5)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -948,7 +942,6 @@ { "internalName": "effect_5", "displayName": "Effect (Stage 6)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -988,7 +981,6 @@ { "internalName": "effect_6", "displayName": "Effect (Stage 7)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1028,7 +1020,6 @@ { "internalName": "effect_7", "displayName": "Effect (Stage 8)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1100,7 +1091,6 @@ { "internalName": "spell_0", "displayName": "Splash Effect (Stage 1)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1140,7 +1130,6 @@ { "internalName": "spell_1", "displayName": "Splash Effect (Stage 2)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1180,7 +1169,6 @@ { "internalName": "spell_2", "displayName": "Splash Effect (Stage 3)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1220,7 +1208,6 @@ { "internalName": "spell_3", "displayName": "Splash Effect (Stage 4)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1260,7 +1247,6 @@ { "internalName": "spell_4", "displayName": "Splash Effect (Stage 5)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1300,7 +1286,6 @@ { "internalName": "spell_5", "displayName": "Splash Effect (Stage 6)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1340,7 +1325,6 @@ { "internalName": "spell_6", "displayName": "Splash Effect (Stage 7)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1380,7 +1364,6 @@ { "internalName": "spell_7", "displayName": "Splash Effect (Stage 8)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "Potion_BaseColour", @@ -1452,7 +1435,6 @@ { "internalName": "spark_0", "displayName": "Firework Spark (Stage 1)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", @@ -1467,7 +1449,6 @@ { "internalName": "spark_1", "displayName": "Firework Spark (Stage 2)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", @@ -1482,7 +1463,6 @@ { "internalName": "spark_2", "displayName": "Firework Spark (Stage 3)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", @@ -1497,7 +1477,6 @@ { "internalName": "spark_3", "displayName": "Firework Spark (Stage 4)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", @@ -1512,7 +1491,6 @@ { "internalName": "spark_4", "displayName": "Firework Spark (Stage 5)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", @@ -1527,7 +1505,6 @@ { "internalName": "spark_5", "displayName": "Firework Spark (Stage 6)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", @@ -1542,7 +1519,6 @@ { "internalName": "spark_6", "displayName": "Firework Spark (Stage 7)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", @@ -1557,7 +1533,6 @@ { "internalName": "spark_7", "displayName": "Firework Spark (Stage 8)", - "allowCustomColour": true, "hasColourEntry": true, "colourEntry": { "defaultName": "None", diff --git a/PckStudio.Core/Json/TileInfo.cs b/PckStudio.Core/Json/TileInfo.cs index db8628a5..e75f0a05 100644 --- a/PckStudio.Core/Json/TileInfo.cs +++ b/PckStudio.Core/Json/TileInfo.cs @@ -27,9 +27,6 @@ namespace PckStudio.Core.Json [JsonProperty("colourEntry", DefaultValueHandling = DefaultValueHandling.Ignore)] public JsonColorEntry ColourEntry { get; set; } - [JsonProperty("allowCustomColour", DefaultValueHandling = DefaultValueHandling.Populate)] - public bool AllowCustomColour { get; set; } - public JsonTileInfo(string displayName, string internalName) { DisplayName = displayName;