Backport.

This commit is contained in:
bconlon 2020-08-24 19:03:13 -07:00
parent fb4d89e8f8
commit b117feb7ba
2 changed files with 23 additions and 10 deletions

View file

@ -17,7 +17,7 @@ public class AetherConfig {
private static boolean disable_trivia, old_mobs; 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; 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); 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); 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); travel_dimension = config.get("Misc", "Dimension below aether", 0).getInt(0);
floating_block_collision = config.get("Misc", "Floating block collision", true).getBoolean(true); floating_block_collision = config.get("Misc", "Floating block collision", true).getBoolean(true);
@ -126,6 +127,11 @@ public class AetherConfig {
return AetherConfig.valkyrie_cape; return AetherConfig.valkyrie_cape;
} }
public static boolean goldenFeatherEnabled()
{
return AetherConfig.golden_feather;
}
public static boolean menuEnabled() public static boolean menuEnabled()
{ {
return AetherConfig.menu_enabled; return AetherConfig.menu_enabled;

View file

@ -516,7 +516,7 @@ public class ComponentSilverDungeon extends AetherStructure {
} }
public static ItemStack getSilverLoot(Random random) { public static ItemStack getSilverLoot(Random random) {
int item = random.nextInt(13); int item = random.nextInt(14);
switch (item) { switch (item) {
case 0: case 0:
@ -552,20 +552,27 @@ public class ComponentSilverDungeon extends AetherStructure {
return new ItemStack(ItemsAether.neptune_boots); return new ItemStack(ItemsAether.neptune_boots);
return new ItemStack(ItemsAether.neptune_gloves); return new ItemStack(ItemsAether.neptune_gloves);
} }
case 8: case 8: {
return new ItemStack(ItemsAether.invisibility_cape);
case 9: {
if (random.nextBoolean()) if (random.nextBoolean())
return new ItemStack(ItemsAether.valkyrie_boots); return new ItemStack(ItemsAether.valkyrie_boots);
return new ItemStack(ItemsAether.valkyrie_gloves); return new ItemStack(ItemsAether.valkyrie_gloves);
} }
case 10: case 9:
return new ItemStack(ItemsAether.valkyrie_leggings); return new ItemStack(ItemsAether.valkyrie_leggings);
case 11: case 10:
if (random.nextBoolean()) if (random.nextBoolean())
return new ItemStack(ItemsAether.valkyrie_chestplate); 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);
} }
} }