Merge branch 'master' into kotlin_reformat

4 files changed, 18 insertions, 19 deletions

diff --git a/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java b/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
index afd1452..d746c23 100644
--- a/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
+++ b/src/main/java/dulkirmod/mixins/MixinEntityLivingBase.java
@@ -26,6 +26,6 @@ public abstract class MixinEntityLivingBase extends MixinEntity {
                 (this.isPotionActive(Potion.digSlowdown) ?
                         6 + (1 + this.getActivePotionEffect(Potion.digSlowdown).getAmplifier()) * 2 :
                         6);
-        cir.setReturnValue(Math.max((int)(length* Math.exp(-DulkirMod.Companion.getConfig().getCustomSpeed())), 1));
+        cir.setReturnValue(Math.max((int) (length * Math.exp(-DulkirMod.Companion.getConfig().getCustomSpeed())), 1));
     }
 }
diff --git a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
index 1f421ed..4a50163 100644
--- a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
+++ b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java
@@ -22,25 +22,25 @@ public abstract class MixinGuiContainer extends GuiScreen {
             ci.cancel();
         }
         if (DungeonLeap.Companion.inLeapMenu() && DungeonLeap.Companion.isHighlightedLeapPlayer(slotIn)) {
-                ci.cancel();
+            ci.cancel();
 
-                ItemStack stack = new ItemStack(Blocks.wool, 1, EnumDyeColor.GREEN.getMetadata());
+            ItemStack stack = new ItemStack(Blocks.wool, 1, EnumDyeColor.GREEN.getMetadata());
 
-                this.zLevel = 100.0F;
-                this.itemRender.zLevel = 100.0F;
+            this.zLevel = 100.0F;
+            this.itemRender.zLevel = 100.0F;
 
-                GlStateManager.enableDepth();
-                this.itemRender.renderItemAndEffectIntoGUI(
-                        stack,
-                        slotIn.xDisplayPosition,
-                        slotIn.yDisplayPosition
-                );
-                this.itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, stack,
-                        slotIn.xDisplayPosition, slotIn.yDisplayPosition, ""
-                );
+            GlStateManager.enableDepth();
+            this.itemRender.renderItemAndEffectIntoGUI(
+                    stack,
+                    slotIn.xDisplayPosition,
+                    slotIn.yDisplayPosition
+            );
+            this.itemRender.renderItemOverlayIntoGUI(this.fontRendererObj, stack,
+                    slotIn.xDisplayPosition, slotIn.yDisplayPosition, ""
+            );
 
-                this.itemRender.zLevel = 0.0F;
-                this.zLevel = 0.0F;
+            this.itemRender.zLevel = 0.0F;
+            this.zLevel = 0.0F;
         }
     }
 }
diff --git a/src/main/java/dulkirmod/mixins/MixinRendererManager.java b/src/main/java/dulkirmod/mixins/MixinRendererManager.java
index c695ed2..964e690 100644
--- a/src/main/java/dulkirmod/mixins/MixinRendererManager.java
+++ b/src/main/java/dulkirmod/mixins/MixinRendererManager.java
@@ -26,7 +26,7 @@ public class MixinRendererManager {
             boolean p_147939_10_,
             CallbackInfoReturnable<Boolean> cir
     ) {
-        if(!DulkirMod.Companion.getConfig().getHideHealerFairy()) return;
+        if (!DulkirMod.Companion.getConfig().getHideHealerFairy()) return;
         if (entity instanceof EntityArmorStand) {
             if (((EntityArmorStand) entity).getHeldItem() != null && ((EntityArmorStand) entity).getHeldItem().getItem() == Items.skull) {
                 ItemStack stack = ((EntityArmorStand) entity).getHeldItem();
diff --git a/src/main/java/dulkirmod/mixins/MixinWorld.java b/src/main/java/dulkirmod/mixins/MixinWorld.java
index 97133e1..1502e38 100644
--- a/src/main/java/dulkirmod/mixins/MixinWorld.java
+++ b/src/main/java/dulkirmod/mixins/MixinWorld.java
@@ -15,8 +15,7 @@ public class MixinWorld {
                           double xOffset, double yOffset, double zOffset, int[] p_175720_15_, CallbackInfo ci) {
         if (particleID == 25 && DulkirMod.Companion.getConfig().getHideEnchantRune()) {
             ci.cancel();
-        }
-        else if (particleID == 34 && DulkirMod.Companion.getConfig().getHideHeartParticles()) {
+        } else if (particleID == 34 && DulkirMod.Companion.getConfig().getHideHeartParticles()) {
             ci.cancel();
         }
     }