Rename shulkerSpawning to shulkerSpawnsOnDragonKill

jsorrell · May 18, 2022 · 8eb4009 · 8eb4009
1 parent 7200522
commit 8eb4009
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/main/java/com/jsorrell/skyblock/mixin/EnderDragonFightMixin.java b/src/main/java/com/jsorrell/skyblock/mixin/EnderDragonFightMixin.java
@@ -50,7 +50,7 @@ private void setExitPortalLocation(boolean previouslyKilled, CallbackInfo ci) {
       target = "Lnet/minecraft/entity/boss/dragon/EnderDragonFight;previouslyKilled:Z",
       opcode = Opcodes.PUTFIELD))
   private void spawnShulkerOnDragonReKill(EnderDragonEntity dragon, CallbackInfo ci) {
-    if (SkyBlockSettings.shulkerSpawning) {
+    if (SkyBlockSettings.shulkerSpawnsOnDragonKill) {
       // On top of bedrock pillar
       BlockPos shulkerPosition = this.exitPortalLocation.add(0, 4, 0);
       if (this.previouslyKilled && this.world.getBlockState(shulkerPosition).isOf(Blocks.AIR)) {

diff --git a/src/main/java/com/jsorrell/skyblock/settings/SkyBlockSettings.java b/src/main/java/com/jsorrell/skyblock/settings/SkyBlockSettings.java
@@ -109,11 +109,24 @@ public FieldPair fix(FieldPair fieldPair) {
   public static boolean renewableDragonHeads = false;
 
   /* Shulker Spawning */
+  private static class ShulkerSpawningNameFix extends SettingFixer {
+    @Override
+    public String[] alternateNames() {
+      return new String[]{"shulkerSpawning"};
+    }
+
+    @Override
+    public FieldPair fix(FieldPair fieldPair) {
+      fieldPair.setName("shulkerSpawnsOnDragonKill");
+      return fieldPair;
+    }
+  }
+
   @Rule(
     desc = "Shulkers spawn on obsidian pillar when Ender Dragon is re-killed",
     category = {FEATURE})
-  @SkyBlockSetting("true")
-  public static boolean shulkerSpawning = false;
+  @SkyBlockSetting(value = "true", fixer = ShulkerSpawningNameFix.class)
+  public static boolean shulkerSpawnsOnDragonKill = false;
 
   /* Anvils Compact Coal into Diamonds */
   @Rule(
@@ -183,7 +196,7 @@ public FieldPair fix(FieldPair fieldPair) {
   public static boolean saplingsDieOnSand = false;
 
   @Rule(
-    desc = "Creatures with Echolocation Drop Echo Shardes when Killed with Sonic Booms",
+    desc = "Creatures with Echolocation Drop Echo Shards when Killed with Sonic Booms",
     category = {FEATURE})
   @SkyBlockSetting("true")
   public static boolean renewableEchoShards = false;