Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony

src/main/java/com/minelittlepony/CasedResourceLocation.java

@@ -1,23 +0,0 @@
-package com.minelittlepony;
-
-import net.minecraft.util.ResourceLocation;
-
-public class CasedResourceLocation extends ResourceLocation {
-    protected final String casedPath;
-
-    public CasedResourceLocation(String domain, String path) {
-        super(domain, path);
-
-        casedPath = path;
-    }
-
-    @Override
-    public String getPath() {
-        return casedPath;
-    }
-
-    @Override
-    public String toString() {
-        return namespace + ':' + casedPath;
-    }
-}

src/main/java/com/minelittlepony/PonyManager.java

@@ -245,7 +245,7 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl
         private String path;
 
         private ResourceLocation apply(String input) {
-            return new CasedResourceLocation(domain, String.format("%s%s.png", path, input));
+            return new ResourceLocation(domain, String.format("%s%s.png", path, input));
         }
 
         private ResourceLocation makeImport(String input) {

src/main/resources/assets/minelittlepony/textures/entity/pony/bgponies.json

@@ -4,155 +4,155 @@
     // A list of sub-directories to include
     // Pony textures are loaded according to subpath/bgponies.json
     "imports": [
-        "mane six",
+        "mane_six",
         "villains"
-    ]
+    ],
     // A list of all the pony names without the extension
     // e.g. textures/entity/pony/bgpony_12.png
     "ponies": [
-        "Allie Way",
+        "allie_way",
-        "Aloe Blossom",
+        "aloe_blossom",
-        "Ambrosia",
+        "ambrosia",
-        "Amethyst Star",
+        "amethyst_star",
-        "Apple Bloom",
+        "apple_bloom",
-        "Apple Cider",
+        "apple_cider",
-        "Apple Fritter",
+        "apple_fritter",
-        "Apple Strudel",
+        "apple_strudel",
-        "Babs Seed",
+        "babs_seed",
-        "Banana Fluff",
+        "banana_fluff",
-        "Berry Punch",
+        "berry_punch",
-        "Big Macintosh",
+        "big_macintosh",
-        "Big Wig",
+        "big_wig",
-        "Blockwork",
+        "blockwork",
-        "Blueberry Muffin",
+        "blueberry_muffin",
-        "Bon Bon",
+        "bon_bon",
-        "Braeburn",
+        "braeburn",
-        "Brolly",
+        "brolly",
-				"Bulk Biceps",
+        "bulk_biceps",
-        "Caramel",
+        "caramel",
-				"Carrot Cake",
+        "carrot_cake",
-        "Carrot Top",
+        "carrot_top",
-        "Cheerilee",
+        "cheerilee",
-        "Chelsea Porcelain",
+        "chelsea_porcelain",
-        "Cherry Berry",
+        "cherry_berry",
-				"Cherry Ice",
+        "cherry_ice",
-        "Cherry Jubilee",
+        "cherry_jubilee",
-        "Chocolate Sun",
+        "chocolate_sun",
-        "Cloud Chaser",
+        "cloud_chaser",
-        "Cloud Kicker",
+        "cloud_kicker",
-				"Cloudy Quartz",
+        "cloudy_quartz",
-        "Colgate",
+        "colgate",
-        "Cotton Pie Joe",
+        "cotton_pie_joe",
-        "Cranky Doodle Donkey",
+        "cranky_doodle_donkey",
-				"Cup Cake",
+        "cup_cake",
-				"Daisy",
+        "daisy",
-				"Daring Do",
+        "daring_do",
-				"Derpy Hooves",
+        "derpy_hooves",
-				"Diamond Tiara",
+        "diamond_tiara",
-				"Dinky Doo",
+        "dinky_doo",
-				"Dizzy Twister",
+        "dizzy_twister",
-				"Doctor Hooves",
+        "doctor_hooves",
-				"Doughnut Joe",
+        "doughnut_joe",
-				"Endless Clouds",
+        "endless_clouds",
-				"Fancy Pants",
+        "fancy_pants",
-				"Featherweight",
+        "featherweight",
-				"Fiddlesticks",
+        "fiddlesticks",
-				"Film Reel",
+        "film_reel",
-				"Filthy Rich",
+        "filthy_rich",
-				"Flam",
+        "flam",
-				"Fleetfoot",
+        "fleetfoot",
-				"Fleur de Lis",
+        "fleur_de_lis",
-				"Flim",
+        "flim",
-				"Flitter",
+        "flitter",
-				"Fruitbasket",
+        "fruitbasket",
-				"Giselle",
+        "giselle",
-				"Gizmo",
+        "gizmo",
-				"Golden Harvest",
+        "golden_harvest",
-				"Granny Smith",
+        "granny_smith",
-				"Hairy Tipper",
+        "hairy_tipper",
-				"Happy Trails",
+        "happy_trails",
-				"High Style",
+        "high_style",
-				"Holly Dash",
+        "holly_dash",
-				"Horte Cuisine",
+        "horte_cuisine",
-				"Igneous Rock",
+        "igneous_rock",
-				"Jangles",
+        "jangles",
-				"Junebug",
+        "junebug",
-				"Lemon Hearts",
+        "lemon_hearts",
-				"Lightning Bolt",
+        "lightning_bolt",
-				"Lightning Dust",
+        "lightning_dust",
-				"Lilly",
+        "lilly",
-				"Limestone Pie",
+        "limestone_pie",
-				"Lotus Blossom",
+        "lotus_blossom",
-				"Lyra heartstrings",
+        "lyra_heartstrings",
-				"Marble Pie",
+        "marble_pie",
-				"Masquerade",
+        "masquerade",
-				"Math Teacher",
+        "math_teacher",
-				"Mayor Mare",
+        "mayor_mare",
-				"Merry May",
+        "merry_may",
-				"Millie",
+        "millie",
-				"Mjölna",
+        "mjolna",
-				"Morton Saltworthy",
+        "morton_saltworthy",
-				"Mr Smarty pants",
+        "mr_smarty_pants",
-				"Mr Waddle",
+        "mr_waddle",
-				"Ms Harshwhinny",
+        "ms_harshwhinny",
-				"Ms Peachbottom",
+        "ms_peachbottom",
-				"Mulia Mild",
+        "mulia_mild",
-				"Neon Lights",
+        "neon_lights",
-				"Night Guard (Pegasus)",
+        "night_guard_pegasus",
-				"Night Guard (Unicorn)",
+        "night_guard_unicorn",
-				"Night Guard (Bat)",
+        "night_guard_bat",
-        "Night Light",
+        "night_light",
-				"North Pole",
+        "north_pole",
-				"Noteworthy",
+        "noteworthy",
-				"Nurse Redheart",
+        "nurse_redheart",
-				"Octavia Melody",
+        "octavia_melody",
-				"Orange Box",
+        "orange_box",
-				"Orchid Dew",
+        "orchid_dew",
-				"Photo Finish",
+        "photo_finish",
-				"Picture Perfect",
+        "picture_perfect",
-				"Pipsqueak",
+        "pipsqueak",
-				"Post Haste",
+        "post_haste",
-				"Pretty Vision",
+        "pretty_vision",
-				"Prince Blueblood",
+        "prince_blueblood",
-				"Raindrops",
+        "raindrops",
-				"Red Gala",
+        "red_gala",
-				"Roseluck",
+        "roseluck",
-				"Roy G Bow",
+        "roy_g_bow",
-				"Royal Earth Pony Guard",
+        "royal_earth_pony_guard",
-				"Royal Pegasus Guard",
+        "royal_pegasus_guard",
-				"Royal Unicorn Guard",
+        "royal_unicorn_guard",
-				"Ruby Pinch",
+        "ruby_pinch",
-				"Salty",
+        "salty",
-				"Sapphire Shores",
+        "sapphire_shores",
-				"Scootaloo",
+        "scootaloo",
-				"Screw Loose",
+        "screw_loose",
-				"Screwball",
+        "screwball",
-				"Sea Swirl",
+        "sea_swirl",
-				"Sharpener",
+        "sharpener",
-				"Silver Spoon",
+        "silver_spoon",
-				"Silver String",
+        "silver_string",
-				"Symphony",
+        "symphony",
-				"Silverspeed",
+        "silverspeed",
-				"Snails",
+        "snails",
-				"Snips",
+        "snips",
-				"Soarin",
+        "soarin",
-				"Soigne Folio",
+        "soigne_folio",
-				"Spitfire",
+        "spitfire",
-				"Stella",
+        "stella",
-				"Sunstreak",
+        "sunstreak",
-				"Sweetie Belle",
+        "sweetie_belle",
-				"Tailor the Tailor",
+        "tailor_the_tailor",
-				"The Dude",
+        "the_dude",
-				"Thunderlane",
+        "thunderlane",
-				"Trixie Lulamoon",
+        "trixie_lulamoon",
-				"Twilight Sky",
+        "twilight_sky",
-				"Twilight Velvet",
+        "twilight_velvet",
-				"Twist",
+        "twist",
-				"Under D Weather",
+        "under_d_weather",
-				"Velvet Hooves",
+        "velvet_hooves",
-				"Vinyl Scratch",
+        "vinyl_scratch",
-				"Wild Flower",
+        "wild_flower",
-				"Wildfire",
+        "wildfire",
-				"Zecora"
+        "zecora"
     ]
 }