From b117feb7ba5e606a38e472d9202c9bde4bb22e34 Mon Sep 17 00:00:00 2001
From: bconlon <bconlon@gildedgames.com>
Date: Mon, 24 Aug 2020 19:03:13 -0700
Subject: [PATCH] Backport.

---
 .../gildedgames/the_aether/AetherConfig.java  | 10 ++++++--
 .../components/ComponentSilverDungeon.java    | 23 ++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/gildedgames/the_aether/AetherConfig.java b/src/main/java/com/gildedgames/the_aether/AetherConfig.java
index 640f901..d7f60f5 100644
--- a/src/main/java/com/gildedgames/the_aether/AetherConfig.java
+++ b/src/main/java/com/gildedgames/the_aether/AetherConfig.java
@@ -17,7 +17,7 @@ public class AetherConfig {
 
 	private static boolean disable_trivia, old_mobs;
 
-	private static boolean skyrootBucketOnly, valkyrie_cape;
+	private static boolean skyrootBucketOnly, valkyrie_cape, golden_feather;
 
 	private static boolean floating_block_collision;
 
@@ -53,7 +53,8 @@ public class AetherConfig {
 		aether_biome_id = config.get("World Identification", "Aether Biome ID", 127).getInt(127);
 
 		skyrootBucketOnly = config.get("Misc", "Activate portal with only Skyroot bucket", false).getBoolean(false);
-		valkyrie_cape = config.get("Misc", "Swaps the Golden Feather with the Valkyrie Cape in dungeon loot", false).getBoolean(false);
+		valkyrie_cape = config.get("Misc", "Enables the Valkyrie Cape in dungeon loot", true).getBoolean(true);
+		golden_feather = config.get("Misc", "Enables the Golden Feather in dungeon loot", false).getBoolean(false);
 		travel_dimension = config.get("Misc", "Dimension below aether", 0).getInt(0);
 		floating_block_collision = config.get("Misc", "Floating block collision", true).getBoolean(true);
 
@@ -126,6 +127,11 @@ public class AetherConfig {
 		return AetherConfig.valkyrie_cape;
 	}
 
+	public static boolean goldenFeatherEnabled()
+	{
+		return AetherConfig.golden_feather;
+	}
+
 	public static boolean menuEnabled()
 	{
 		return AetherConfig.menu_enabled;
diff --git a/src/main/java/com/gildedgames/the_aether/world/gen/components/ComponentSilverDungeon.java b/src/main/java/com/gildedgames/the_aether/world/gen/components/ComponentSilverDungeon.java
index bae5764..a124d75 100644
--- a/src/main/java/com/gildedgames/the_aether/world/gen/components/ComponentSilverDungeon.java
+++ b/src/main/java/com/gildedgames/the_aether/world/gen/components/ComponentSilverDungeon.java
@@ -516,7 +516,7 @@ public class ComponentSilverDungeon extends AetherStructure {
 	}
 
 	public static ItemStack getSilverLoot(Random random) {
-		int item = random.nextInt(13);
+		int item = random.nextInt(14);
 
 		switch (item) {
 			case 0:
@@ -552,20 +552,27 @@ public class ComponentSilverDungeon extends AetherStructure {
 					return new ItemStack(ItemsAether.neptune_boots);
 				return new ItemStack(ItemsAether.neptune_gloves);
 			}
-			case 8:
-				return new ItemStack(ItemsAether.invisibility_cape);
-			case 9: {
+			case 8: {
 				if (random.nextBoolean())
 					return new ItemStack(ItemsAether.valkyrie_boots);
 				return new ItemStack(ItemsAether.valkyrie_gloves);
 			}
-			case 10:
+			case 9:
 				return new ItemStack(ItemsAether.valkyrie_leggings);
-			case 11:
+			case 10:
 				if (random.nextBoolean())
 					return new ItemStack(ItemsAether.valkyrie_chestplate);
+			case 11:
+				if (random.nextBoolean())
+					return new ItemStack(ItemsAether.valkyrie_boots);
+				return new ItemStack(ItemsAether.valkyrie_gloves);
+			case 12:
+				if (AetherConfig.valkyrieCapeEnabled())
+					return new ItemStack(ItemsAether.valkyrie_cape);
+			case 13:
+				if (AetherConfig.goldenFeatherEnabled())
+					return new ItemStack(ItemsAether.golden_feather);
 		}
-		return AetherConfig.valkyrieCapeEnabled() ? new ItemStack(ItemsAether.valkyrie_cape) : new ItemStack(ItemsAether.golden_feather);
+		return new ItemStack(ItemsAether.invisibility_cape);
 	}
-
 }
\ No newline at end of file