From 9e97d1f21e8b37edc766614868453097f862b5f0 Mon Sep 17 00:00:00 2001 From: Edward Chernenko Date: Sat, 7 Dec 2024 15:03:40 +0300 Subject: [PATCH] Fix typo that prevented 8 blocks from being painted 1) should be "multiColored", not "multicolored" 2) this key should be under "renderParameters" array, in some files it was outside this array (fixed) Non-unobtainable blocks that can now be painted: Bamboo Brittle Metal Frozen Wax Platform Red Wax Platform Plasteel Wall Plasteel Tile Hellfire Bricks Hellfire Stone --- tiles/materials/bamboo.material | 2 +- tiles/materials/brittlemetal.material | 2 +- tiles/materials/ff_diamondblock.material | 1 - tiles/materials/fusteelgirdir.material | 3 +-- tiles/materials/honey/frozenwaxblock.material | 1 - tiles/materials/honey/frozenwaxplatform.material | 2 +- tiles/materials/honey/fu_honeycombblock.material | 1 - tiles/materials/honey/fu_redhoneycombblock.material | 1 - tiles/materials/honey/goldenglass/goldenglass.material | 1 - tiles/materials/honey/redwaxblock.material | 1 - tiles/materials/honey/redwaxplatform.material | 2 +- tiles/materials/honey/waxblock1.material | 1 - tiles/materials/honey/whitewaxblock.material | 1 - tiles/materials/penumbriteblock.material | 1 - tiles/materials/pixelgoods/fujellyblock2.material | 2 +- tiles/materials/pixelgoods/fuokeagrass.material | 2 +- tiles/materials/pixelgoods/fuokeahitechwall1.material | 2 +- tiles/materials/pixelgoods/fuokeahitechwall2.material | 3 +-- tiles/materials/pixelgoods/fuokeamagmabrick.material | 3 +-- tiles/materials/pixelgoods/fuokeamagmastone.material | 3 +-- tiles/materials/protoblock.material | 1 - 21 files changed, 11 insertions(+), 25 deletions(-) diff --git a/tiles/materials/bamboo.material b/tiles/materials/bamboo.material index d6a6b6f893f..dcb317e596a 100644 --- a/tiles/materials/bamboo.material +++ b/tiles/materials/bamboo.material @@ -20,7 +20,7 @@ "variants" : 5, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 } } diff --git a/tiles/materials/brittlemetal.material b/tiles/materials/brittlemetal.material index 50d13000f42..c4d0fbf570a 100644 --- a/tiles/materials/brittlemetal.material +++ b/tiles/materials/brittlemetal.material @@ -17,7 +17,7 @@ "variants" : 3, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 }, "liquidInteractions" : [ diff --git a/tiles/materials/ff_diamondblock.material b/tiles/materials/ff_diamondblock.material index 869511609f5..c1e131ccf2d 100644 --- a/tiles/materials/ff_diamondblock.material +++ b/tiles/materials/ff_diamondblock.material @@ -5,7 +5,6 @@ "itemDrop" : "diamondblockmaterial", "description" : "A solid block of diamond alloy.", "shortdescription" : "Diamond block", - "multicolored" : false, "footstepSound" : "/sfx/blocks/footstep_metallic.ogg", "tillableMod" : 31, "soil" : true, diff --git a/tiles/materials/fusteelgirdir.material b/tiles/materials/fusteelgirdir.material index 344d1db00a8..a735535f661 100644 --- a/tiles/materials/fusteelgirdir.material +++ b/tiles/materials/fusteelgirdir.material @@ -5,7 +5,6 @@ "itemDrop" : "fusteelgirdirmaterial", "description" : "A solid steel girder", "shortdescription" : "Steel Girder", - "multicolored" : false, "footstepSound" : "/sfx/blocks/footstep_girder.ogg", "health" : 20, "category": "materials", @@ -19,4 +18,4 @@ "multiColored" : false, "zLevel" : 100 } -} \ No newline at end of file +} diff --git a/tiles/materials/honey/frozenwaxblock.material b/tiles/materials/honey/frozenwaxblock.material index 46bed7165f1..cd554ded320 100644 --- a/tiles/materials/honey/frozenwaxblock.material +++ b/tiles/materials/honey/frozenwaxblock.material @@ -6,7 +6,6 @@ "description" : "A block of frozen wax.", "shortdescription" : "Frozen Wax Block", "category": "material", - "multicolored" : false, "footstepSound" : "/sfx/blocks/footstep_ice.ogg", "health" : 3, "renderTemplate" : "/tiles/classicmaterialtemplate.config", diff --git a/tiles/materials/honey/frozenwaxplatform.material b/tiles/materials/honey/frozenwaxplatform.material index 2c1892e1f49..31181423b8c 100644 --- a/tiles/materials/honey/frozenwaxplatform.material +++ b/tiles/materials/honey/frozenwaxplatform.material @@ -16,7 +16,7 @@ "variants" : 1, "lightTransparent" : true, "occludesBelow" : false, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0, "platform" : true } diff --git a/tiles/materials/honey/fu_honeycombblock.material b/tiles/materials/honey/fu_honeycombblock.material index efcf01aa86d..2a9998406a1 100644 --- a/tiles/materials/honey/fu_honeycombblock.material +++ b/tiles/materials/honey/fu_honeycombblock.material @@ -5,7 +5,6 @@ "itemDrop" : "fu_honeycombblock", "description" : "A block of honeycombs! Yum!", "shortdescription" : "Honeycomb Block", - "multicolored" : true, "category": "material", "footstepSound" : "/sfx/blocks/footstep_gravel.ogg", "health" : 5, diff --git a/tiles/materials/honey/fu_redhoneycombblock.material b/tiles/materials/honey/fu_redhoneycombblock.material index 8bfc5982be0..ecdd3504d26 100644 --- a/tiles/materials/honey/fu_redhoneycombblock.material +++ b/tiles/materials/honey/fu_redhoneycombblock.material @@ -5,7 +5,6 @@ "itemDrop" : "fu_redhoneycombblock", "description" : "A block of red honeycombs! Yum!", "shortdescription" : "Red Honeycomb Block", - "multicolored" : true, "category": "material", "footstepSound" : "/sfx/blocks/footstep_ice.ogg", "health" : 5, diff --git a/tiles/materials/honey/goldenglass/goldenglass.material b/tiles/materials/honey/goldenglass/goldenglass.material index 39068bdaa3d..ad23989fe03 100644 --- a/tiles/materials/honey/goldenglass/goldenglass.material +++ b/tiles/materials/honey/goldenglass/goldenglass.material @@ -9,7 +9,6 @@ "shortdescription" : "Golden Glass Block", "glitchDescription" : "Statement. Glass.", "floranDescription" : "Floran look pretty in glasssss.", - "multicolored" : false, "footstepSound" : "/sfx/blocks/footstep_glass.ogg", "health" : 3, "renderTemplate" : "/tiles/fuclassicnopaint.config", diff --git a/tiles/materials/honey/redwaxblock.material b/tiles/materials/honey/redwaxblock.material index 67abd4b1384..a86b9e1cbef 100644 --- a/tiles/materials/honey/redwaxblock.material +++ b/tiles/materials/honey/redwaxblock.material @@ -5,7 +5,6 @@ "itemDrop" : "redwaxblock", "description" : "A red block of wax.", "shortdescription" : "Red Wax Block", - "multicolored" : true, "category": "material", "footstepSound" : "/sfx/blocks/footstep_ice.ogg", "health" : 3, diff --git a/tiles/materials/honey/redwaxplatform.material b/tiles/materials/honey/redwaxplatform.material index 0e86a336e8c..6c9f6eb98bc 100644 --- a/tiles/materials/honey/redwaxplatform.material +++ b/tiles/materials/honey/redwaxplatform.material @@ -16,7 +16,7 @@ "variants" : 1, "lightTransparent" : true, "occludesBelow" : false, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0, "platform" : true } diff --git a/tiles/materials/honey/waxblock1.material b/tiles/materials/honey/waxblock1.material index a2fa9d6b3dd..db485086dad 100644 --- a/tiles/materials/honey/waxblock1.material +++ b/tiles/materials/honey/waxblock1.material @@ -5,7 +5,6 @@ "itemDrop" : "waxblock1", "description" : "A block of wax.", "shortdescription" : "Wax Block", - "multicolored" : true, "category": "material", "footstepSound" : "/sfx/blocks/footstep_ice.ogg", "health" : 3, diff --git a/tiles/materials/honey/whitewaxblock.material b/tiles/materials/honey/whitewaxblock.material index af9723a61e8..7a82dd1fed0 100644 --- a/tiles/materials/honey/whitewaxblock.material +++ b/tiles/materials/honey/whitewaxblock.material @@ -6,7 +6,6 @@ "description" : "A block of white wax.", "shortdescription" : "White Wax Block", "category": "material", - "multicolored" : true, "footstepSound" : "/sfx/blocks/footstep_ice.ogg", "health" : 3, "renderTemplate" : "/tiles/classicmaterialtemplate.config", diff --git a/tiles/materials/penumbriteblock.material b/tiles/materials/penumbriteblock.material index d01c7bb79c8..aa1e460d74c 100644 --- a/tiles/materials/penumbriteblock.material +++ b/tiles/materials/penumbriteblock.material @@ -5,7 +5,6 @@ "itemDrop" : "penumbriteblockmaterial", "description" : "A solid block of penumbrite alloy.", "shortdescription" : "Penumbrite block", - "multicolored" : false, "footstepSound" : "/sfx/blocks/footstep_metallic.ogg", "health" : 44, "category": "materials", diff --git a/tiles/materials/pixelgoods/fujellyblock2.material b/tiles/materials/pixelgoods/fujellyblock2.material index b45e999e0d4..df9681483fa 100644 --- a/tiles/materials/pixelgoods/fujellyblock2.material +++ b/tiles/materials/pixelgoods/fujellyblock2.material @@ -16,7 +16,7 @@ "variants" : 5, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 } } \ No newline at end of file diff --git a/tiles/materials/pixelgoods/fuokeagrass.material b/tiles/materials/pixelgoods/fuokeagrass.material index b2ceda962c4..13f266ce577 100644 --- a/tiles/materials/pixelgoods/fuokeagrass.material +++ b/tiles/materials/pixelgoods/fuokeagrass.material @@ -16,7 +16,7 @@ "variants" : 5, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 } } diff --git a/tiles/materials/pixelgoods/fuokeahitechwall1.material b/tiles/materials/pixelgoods/fuokeahitechwall1.material index 1e502e0dd01..f09f15673aa 100644 --- a/tiles/materials/pixelgoods/fuokeahitechwall1.material +++ b/tiles/materials/pixelgoods/fuokeahitechwall1.material @@ -15,7 +15,7 @@ "variants" : 15, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 } } diff --git a/tiles/materials/pixelgoods/fuokeahitechwall2.material b/tiles/materials/pixelgoods/fuokeahitechwall2.material index 4f48f7e500c..32ffdf250f2 100644 --- a/tiles/materials/pixelgoods/fuokeahitechwall2.material +++ b/tiles/materials/pixelgoods/fuokeahitechwall2.material @@ -5,7 +5,6 @@ "itemDrop" : "fuokeahitechwall2", "description" : "Plasteel is pretty awesome.", "shortdescription" : "Plasteel Tile", - "multicolored" : true, "footstepSound" : "/sfx/blocks/footstep_metallic.ogg", "health" : 20, "category": "materials", @@ -16,7 +15,7 @@ "variants" : 1, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 } } diff --git a/tiles/materials/pixelgoods/fuokeamagmabrick.material b/tiles/materials/pixelgoods/fuokeamagmabrick.material index 458b9ca0549..449f8181c6f 100644 --- a/tiles/materials/pixelgoods/fuokeamagmabrick.material +++ b/tiles/materials/pixelgoods/fuokeamagmabrick.material @@ -3,7 +3,6 @@ "materialName" : "fuokeamagmabrick", "particleColor" : [80, 80, 80, 255], "itemDrop" : "fuokeamagmabrick", - "multicolored" : true, "description" : "Bricks made out of magmastone and hellfire.", "shortdescription" : "Hellfire Bricks", "footstepSound" : "/sfx/blocks/footstep_stone3.ogg", @@ -16,7 +15,7 @@ "variants" : 10, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 } } diff --git a/tiles/materials/pixelgoods/fuokeamagmastone.material b/tiles/materials/pixelgoods/fuokeamagmastone.material index b42b6046e29..e71e8cdc246 100644 --- a/tiles/materials/pixelgoods/fuokeamagmastone.material +++ b/tiles/materials/pixelgoods/fuokeamagmastone.material @@ -5,7 +5,6 @@ "itemDrop" : "fuokeamagmastone", "description" : "Stone made out of magmastone and hellfire.", "shortdescription" : "Hellfire Stone", - "multicolored" : true, "footstepSound" : "/sfx/blocks/footstep_stone3.ogg", "health" : 30, "category": "materials", @@ -16,7 +15,7 @@ "variants" : 5, "lightTransparent" : false, "occludesBelow" : true, - "multicolored" : true, + "multiColored" : true, "zLevel" : 0 } } diff --git a/tiles/materials/protoblock.material b/tiles/materials/protoblock.material index be673ad1f49..9df692c06a5 100644 --- a/tiles/materials/protoblock.material +++ b/tiles/materials/protoblock.material @@ -5,7 +5,6 @@ "itemDrop" : "protoblockmaterial", "description" : "A solid block of protocite.", "shortdescription" : "Protocite block", - "multicolored" : false, "footstepSound" : "/sfx/blocks/footstep_metallic.ogg", "health" : 24, "category": "materials",