From 2dc24ced9d10a0fda4df70c90471499abd66595b Mon Sep 17 00:00:00 2001
From: Cal <cwolfson58@gmail.com>
Date: Fri, 25 Oct 2024 10:16:00 +1100
Subject: code cleanup

---
 .../at/hannibal2/skyhanni/utils/compat/World.kt    | 30 ++++++++++++----------
 versions/mapping-1.16.5-forge-1.12.2.txt           |  3 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt b/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
index 827e7d3cf..48b99b311 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/compat/World.kt
@@ -1,13 +1,5 @@
 package at.hannibal2.skyhanni.utils.compat
 
-//#if MC > 1.16
-//$$import net.minecraft.ChatFormatting
-//$$import net.minecraft.network.chat.TextColor
-//#endif
-//#if MC > 1.20
-//$$import net.minecraft.text.MutableText
-//$$import net.minecraft.text.PlainTextContent
-//#endif
 import net.minecraft.client.Minecraft
 import net.minecraft.client.multiplayer.WorldClient
 import net.minecraft.entity.Entity
@@ -15,6 +7,17 @@ import net.minecraft.entity.item.EntityArmorStand
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.potion.Potion
 import net.minecraft.util.IChatComponent
+//#if MC > 1.12
+//$$ import net.minecraft.init.PotionTypes
+//#endif
+//#if MC > 1.16
+//$$ import net.minecraft.ChatFormatting
+//$$ import net.minecraft.network.chat.TextColor
+//#endif
+//#if MC > 1.20
+//$$ import net.minecraft.text.MutableText
+//$$ import net.minecraft.text.PlainTextContent
+//#endif
 
 fun WorldClient.getLoadedPlayers(): List<EntityPlayer> =
 //#if MC < 1.14
@@ -23,18 +26,17 @@ fun WorldClient.getLoadedPlayers(): List<EntityPlayer> =
 //$$ this.players()
 //#endif
 
-
 fun Entity.getNameAsString(): String =
     this.name
 //#if MC >= 1.14
-//$$ .getString()
+//$$ .string
 //#endif
 
 fun EntityArmorStand.getArmorOrFullInventory() =
 //#if MC < 1.12
     this.inventory
 //#else
-//$$ this.getArmorInventoryList()
+//$$ this.armorInventoryList
 //#endif
 
 fun Minecraft.isOnMainThread() =
@@ -52,6 +54,7 @@ fun IChatComponent.getDirectlyContainedText() =
 //#else
 //$$        (this.content as? PlainTextContent)?.string() ?: ""
 //#endif
+
 fun IChatComponent.getFormattedTextCompat() =
 //#if MC < 1.16
     this.formattedText
@@ -78,6 +81,7 @@ fun IChatComponent.getFormattedTextCompat() =
 //$$    return sequenceOf(this) + siblings.asSequence().flatMap { it.iterator() } // TODO: in theory we want to properly inherit styles here
 //$$}
 //#endif
+
 //#if MC > 1.20
 //$$fun MutableText.withColor(formatting: Formatting): Text {
 //$$    return this.styled { it.withColor(formatting) }
@@ -89,8 +93,6 @@ object Effects {
         //#if MC <1.12
         Potion.invisibility
     //#else
-    //$$    net.minecraft.init.PotionTypes.INVISIBILITY
+    //$$    PotionTypes.INVISIBILITY
     //#endif
 }
-
-
diff --git a/versions/mapping-1.16.5-forge-1.12.2.txt b/versions/mapping-1.16.5-forge-1.12.2.txt
index 4bb76b4cd..1293441ec 100644
--- a/versions/mapping-1.16.5-forge-1.12.2.txt
+++ b/versions/mapping-1.16.5-forge-1.12.2.txt
@@ -145,6 +145,7 @@ net.minecraft.network.protocol.game.ServerboundPickItemPacket net.minecraft.netw
 net.minecraft.server.packs.resources.ResourceManager net.minecraft.client.resources.IResourceManager
 
 net.minecraft.world.effect.MobEffect net.minecraft.potion.Potion
+net.minecraft.world.effect.MobEffects net.minecraft.init.PotionTypes
 
 net.minecraft.world.entity.Entity level getEntityWorld()
 net.minecraft.world.entity.Entity net.minecraft.entity.Entity
@@ -155,8 +156,6 @@ net.minecraft.world.entity.Entity yo posY
 net.minecraft.world.entity.Entity zOld prevPosZ
 net.minecraft.world.entity.Entity zo posZ
 
-net.minecraft.world.effect.MobEffects net.minecraft.init.PotionTypes
-
 net.minecraft.world.entity.EquipmentSlot net.minecraft.inventory.EntityEquipmentSlot
 
 net.minecraft.world.entity.LivingEntity getEffect() getActivePotionEffect()
-- 
cgit