diff --git a/mods/ITEMS/mcl_maps/colors.json b/mods/ITEMS/mcl_maps/colors.json index 052e1b7e6..e8b05da64 100644 --- a/mods/ITEMS/mcl_maps/colors.json +++ b/mods/ITEMS/mcl_maps/colors.json @@ -418,6 +418,7 @@ "mcl_core:granite_smooth": [ 150, 121, 110 ], "mcl_core:grass_path": [ 125, 101, 50 ], "mcl_core:gravel": [ 112, 106, 100 ], + "mcl_core:greysand": [ 178, 178, 178 ], "mcl_core:ice": [ 145, 198, 227 ], "mcl_core:ironblock": [ 159, 151, 151 ], "mcl_core:jungleleaves": [ [ 50, 88, 54 ], [ 63, 105, 54 ], [ 68, 94, 55 ], [ 92, 103, 53 ], [ 92, 103, 53 ], [ 43, 57, 27 ], [ 54, 101, 49 ], [ 54, 101, 49 ], [ 128, 100, 47 ], [ 52, 105, 40 ], [ 20, 93, 48 ], [ 53, 97, 55 ], [ 54, 97, 35 ], [ 54, 97, 35 ], [ 47, 82, 37 ], [ 52, 94, 39 ], [ 50, 88, 54 ], [ 54, 101, 49 ] ], @@ -995,11 +996,53 @@ "mcl_meshhand:mcl_skins_character_1_female_surv": [ 93, 91, 78 ], "mcl_minecarts:activator_rail": [ 79, 64, 56, 149 ], "mcl_minecarts:activator_rail_on": [ 87, 63, 55, 149 ], + "mcl_minecarts:activator_rail_v2": [ 79, 64, 56, 149 ], + "mcl_minecarts:activator_rail_v2_corner": [ 67, 57, 53, 86 ], + "mcl_minecarts:activator_rail_v2_cross": [ 66, 57, 53, 167 ], + "mcl_minecarts:activator_rail_v2_on": [ 87, 63, 55, 149 ], + "mcl_minecarts:activator_rail_v2_on_corner": [ 75, 55, 52, 86 ], + "mcl_minecarts:activator_rail_v2_on_cross": [ 73, 56, 52, 167 ], + "mcl_minecarts:activator_rail_v2_on_sloped": [ 87, 63, 55, 149 ], + "mcl_minecarts:activator_rail_v2_on_tee_off": [ 77, 62, 56, 164 ], + "mcl_minecarts:activator_rail_v2_on_tee_on": [ 77, 62, 56, 164 ], + "mcl_minecarts:activator_rail_v2_sloped": [ 79, 64, 56, 149 ], + "mcl_minecarts:activator_rail_v2_tee_off": [ 73, 62, 57, 164 ], + "mcl_minecarts:activator_rail_v2_tee_on": [ 73, 62, 57, 164 ], "mcl_minecarts:detector_rail": [ 86, 75, 68, 166 ], "mcl_minecarts:detector_rail_on": [ 88, 74, 67, 160 ], + "mcl_minecarts:detector_rail_v2": [ 86, 75, 68, 166 ], + "mcl_minecarts:detector_rail_v2_corner": [ 78, 70, 67, 118 ], + "mcl_minecarts:detector_rail_v2_cross": [ 77, 70, 65, 187 ], + "mcl_minecarts:detector_rail_v2_on": [ 88, 74, 67, 160 ], + "mcl_minecarts:detector_rail_v2_on_corner": [ 82, 68, 65, 117 ], + "mcl_minecarts:detector_rail_v2_on_cross": [ 78, 69, 64, 181 ], + "mcl_minecarts:detector_rail_v2_on_sloped": [ 88, 74, 67, 160 ], + "mcl_minecarts:detector_rail_v2_on_tee_off": [ 77, 67, 62, 175 ], + "mcl_minecarts:detector_rail_v2_on_tee_on": [ 77, 67, 62, 175 ], + "mcl_minecarts:detector_rail_v2_sloped": [ 86, 75, 68, 166 ], + "mcl_minecarts:detector_rail_v2_tee_off": [ 74, 66, 61, 175 ], + "mcl_minecarts:detector_rail_v2_tee_on": [ 74, 66, 61, 175 ], "mcl_minecarts:golden_rail": [ 92, 78, 61, 148 ], "mcl_minecarts:golden_rail_on": [ 95, 78, 60, 148 ], + "mcl_minecarts:golden_rail_v2": [ 92, 78, 61, 148 ], + "mcl_minecarts:golden_rail_v2_corner": [ 86, 73, 58, 99 ], + "mcl_minecarts:golden_rail_v2_cross": [ 83, 71, 55 ], + "mcl_minecarts:golden_rail_v2_on": [ 95, 78, 60, 148 ], + "mcl_minecarts:golden_rail_v2_on_corner": [ 89, 72, 57, 99 ], + "mcl_minecarts:golden_rail_v2_on_cross": [ 86, 70, 54 ], + "mcl_minecarts:golden_rail_v2_on_sloped": [ 95, 78, 60, 148 ], + "mcl_minecarts:golden_rail_v2_on_tee_off": [ 82, 70, 59, 166 ], + "mcl_minecarts:golden_rail_v2_on_tee_on": [ 82, 70, 59, 166 ], + "mcl_minecarts:golden_rail_v2_sloped": [ 92, 78, 61, 148 ], + "mcl_minecarts:golden_rail_v2_tee_off": [ 81, 70, 59, 166 ], + "mcl_minecarts:golden_rail_v2_tee_on": [ 81, 70, 59, 166 ], "mcl_minecarts:rail": [ 84, 71, 61, 124 ], + "mcl_minecarts:rail_v2": [ 84, 71, 61, 124 ], + "mcl_minecarts:rail_v2_corner": [ 76, 67, 61, 85 ], + "mcl_minecarts:rail_v2_cross": [ 80, 68, 60 ], + "mcl_minecarts:rail_v2_sloped": [ 84, 71, 61, 124 ], + "mcl_minecarts:rail_v2_tee_off": [ 79, 69, 61, 159 ], + "mcl_minecarts:rail_v2_tee_on": [ 79, 69, 61, 159 ], "mcl_mobspawners:spawner": [ 40, 40, 40, 167 ], "mcl_monster_eggs:monster_egg_cobble": [ 113, 107, 104 ], "mcl_monster_eggs:monster_egg_stone": [ 131, 123, 118 ], diff --git a/tools/minetestmapper/generate_colorstxt.py b/tools/minetestmapper/generate_colorstxt.py index f55666e58..15cd456b7 100755 --- a/tools/minetestmapper/generate_colorstxt.py +++ b/tools/minetestmapper/generate_colorstxt.py @@ -140,6 +140,8 @@ class Filename: self.fn = tokens[0] def gen(self, prev=None): + if self.fn == "blank.png": + return Image.new("RGBA", (1,1), (0, 0, 0, 0)) if not self.fn in textures: raise FileNotFoundError(self.fn) im = Image.open(textures[self.fn]).convert('RGBA')