Merge pull request #120 from TerraformersMC/reduce-jar-size

- Reduce Vistas panoramas to just one to preserve jar size
- Fix broken British English file

Author: Prospector

src/main/java/com/terraformersmc/cinderscapes/init/CinderscapesSoundEvents.java

@@ -21,10 +21,7 @@ public class CinderscapesSoundEvents {
 	public static final SoundEvent LUMINOUS_GROVE_MUSIC = add(new SoundEvent(Cinderscapes.id("music.nether.luminous_grove")));
 	public static final SoundEvent QUARTZ_CANYON_MUSIC = add(new SoundEvent(Cinderscapes.id("music.nether.quartz_canyon")));
 
-	public static final SoundEvent MENU_ASHY_SHOALS_MUSIC = add(new SoundEvent(Cinderscapes.id("music.menu.ashy_shoals")));
-	public static final SoundEvent MENU_BLACKSTONE_SHALES_MUSIC = add(new SoundEvent(Cinderscapes.id("music.menu.blackstone_shales")));
-	public static final SoundEvent MENU_LUMINOUS_GROVE_MUSIC = add(new SoundEvent(Cinderscapes.id("music.menu.luminous_grove")));
-	public static final SoundEvent MENU_QUARTZ_CANYON_MUSIC = add(new SoundEvent(Cinderscapes.id("music.menu.quartz_canyon")));
+	public static final SoundEvent MENU_MUSIC = add(new SoundEvent(Cinderscapes.id("music.menu")));
 
 	public static final SoundEvent MUSIC_DISC_LUMINOUS_PLANTATION = add(new SoundEvent(Cinderscapes.id("music_disc.luminous_plantation")));
 	public static final SoundEvent MUSIC_DISC_CHILLING_IN_HELL = add(new SoundEvent(Cinderscapes.id("music_disc.chilling_in_hell")));

src/main/resources/assets/cinderscapes/lang/en_gb.json

@@ -1,5 +1,5 @@
 {
   "block.cinderscapes.chiseled_sulfur_quartz_block": "Chiselled Sulfur Quartz Block",
   "block.cinderscapes.chiseled_rose_quartz_block": "Chiselled Rose Quartz Block",
-  "block.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block",
+  "block.cinderscapes.chiseled_smoky_quartz_block": "Chiselled Smoky Quartz Block"
 }

src/main/resources/assets/cinderscapes/panoramas.json

@@ -1,22 +1,7 @@
 {
-	"Ashy Shoals": {
-		"name": "ashy_shoals",
-		"panoramaId": "cinderscapes:textures/gui/panorama/ashy_shoals/panorama",
-		"musicId": "cinderscapes:music.menu.ashy_shoals"
-	},
-	"Blackstone Shales": {
-		"name": "blackstone_shales",
-		"panoramaId": "cinderscapes:textures/gui/panorama/blackstone_shales/panorama",
-		"musicId": "cinderscapes:music.menu.blackstone_shales"
-	},
 	"Luminous Grove": {
 		"name": "luminous_grove",
-		"panoramaId": "cinderscapes:textures/gui/panorama/luminous_grove/panorama",
-		"musicId": "cinderscapes:music.menu.luminous_grove"
-	},
-	"Quartz Cavern": {
-		"name": "quartz_cavern",
-		"panoramaId": "cinderscapes:textures/gui/panorama/quartz_cavern/panorama",
-		"musicId": "cinderscapes:music.menu.quartz_canyon"
+		"panoramaId": "cinderscapes:textures/gui/panorama/panorama",
+		"musicId": "cinderscapes:music.menu"
 	}
 }

src/main/resources/assets/cinderscapes/sounds.json

@@ -141,58 +141,9 @@
 			}
 		]
 	},
-	"music.menu.ashy_shoals": {
+	"music.menu": {
 		"category": "music",
 		"sounds": [
-			{
-				"name": "cinderscapes:music.nether.ashy_shoals",
-				"type": "event"
-			},
-			{
-				"name": "cinderscapes:music/ruins",
-				"stream": true,
-				"volume": 0.6,
-				"weight": 3
-			}
-		]
-	},
-	"music.menu.blackstone_shales": {
-		"category": "music",
-		"sounds": [
-			{
-				"name": "cinderscapes:music.nether.blackstone_shales",
-				"type": "event"
-			},
-			{
-				"name": "cinderscapes:music/ruins",
-				"stream": true,
-				"volume": 0.6,
-				"weight": 3
-			}
-		]
-	},
-	"music.menu.luminous_grove": {
-		"category": "music",
-		"sounds": [
-			{
-				"name": "cinderscapes:music.nether.luminous_grove",
-				"type": "event"
-			},
-			{
-				"name": "cinderscapes:music/ruins",
-				"stream": true,
-				"volume": 0.6,
-				"weight": 3
-			}
-		]
-	},
-	"music.menu.quartz_canyon": {
-		"category": "music",
-		"sounds": [
-			{
-				"name": "cinderscapes:music.nether.quartz_canyon",
-				"type": "event"
-			},
 			{
 				"name": "cinderscapes:music/ruins",
 				"stream": true,