summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-11-22 11:50:00 +0000
committerGitHub <noreply@github.com>2023-11-22 12:50:00 +0100
commit4ff0a7de8109b748cdaa707e9714478140095171 (patch)
treed0321aeb182c1ace326c8c851dbf9a7e8861ff62 /src/main/java/at/hannibal2/skyhanni/utils
parent5d1e9a07eabe3872c714b17b64b7a6e0a0073d73 (diff)
downloadskyhanni-4ff0a7de8109b748cdaa707e9714478140095171.tar.gz
skyhanni-4ff0a7de8109b748cdaa707e9714478140095171.tar.bz2
skyhanni-4ff0a7de8109b748cdaa707e9714478140095171.zip
Internal Change: Reformat Code to match .editorconfig (#628)
Code cleanup done everywhere #628
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt26
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/Timer.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java16
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt62
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt3
19 files changed, 143 insertions, 76 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
index 5e935b407..1801e7802 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
@@ -41,9 +41,13 @@ object APIUtil {
.useSystemProperties()
fun getJSONResponse(urlString: String, silentError: Boolean = false) =
- getJSONResponseAsElement(urlString, silentError) as JsonObject
+ getJSONResponseAsElement(urlString, silentError) as JsonObject
- fun getJSONResponseAsElement(urlString: String, silentError: Boolean = false, apiName: String = "Hypixel API"): JsonElement {
+ fun getJSONResponseAsElement(
+ urlString: String,
+ silentError: Boolean = false,
+ apiName: String = "Hypixel API"
+ ): JsonElement {
val client = builder.build()
try {
client.execute(HttpGet(urlString)).use { response ->
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
index 8f05d64ec..78cc8684d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/CachedItemData.kt
@@ -1,11 +1,18 @@
package at.hannibal2.skyhanni.utils
data class CachedItemData(
- /** -1 = not loaded */ var petCandies: Int? = -1,
- /** "" = not loaded */ var heldItem: String? = "",
- /** -1 = not loaded */ var sackInASack: Int? = -1,
- /** null = not loaded */ var riftTransferable: Boolean? = null,
- /** null = not loaded */ var riftExportable: Boolean? = null,
- /** null = not loaded */ var itemRarityLastCheck: Long = 0L, // Cant use SimpleTimeMark here
- /** null = not loaded */ var itemRarity: LorenzRarity? = null,
-) \ No newline at end of file
+ /** -1 = not loaded */
+ var petCandies: Int? = -1,
+ /** "" = not loaded */
+ var heldItem: String? = "",
+ /** -1 = not loaded */
+ var sackInASack: Int? = -1,
+ /** null = not loaded */
+ var riftTransferable: Boolean? = null,
+ /** null = not loaded */
+ var riftExportable: Boolean? = null,
+ /** null = not loaded */
+ var itemRarityLastCheck: Long = 0L, // Cant use SimpleTimeMark here
+ /** null = not loaded */
+ var itemRarity: LorenzRarity? = null,
+)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
index fbe2f1e96..4ac55af01 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
@@ -104,13 +104,13 @@ object EntityOutlineRenderer {
mc.renderManager.setRenderOutlines(true)
// Enable outline mode
- GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL13.GL_COMBINE);
- GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_COMBINE_RGB, GL11.GL_REPLACE);
- GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_SOURCE0_RGB, GL13.GL_CONSTANT);
- GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_OPERAND0_RGB, GL11.GL_SRC_COLOR);
- GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_COMBINE_ALPHA, GL11.GL_REPLACE);
- GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_SOURCE0_ALPHA, GL11.GL_TEXTURE);
- GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_OPERAND0_ALPHA, GL11.GL_SRC_ALPHA);
+ GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL11.GL_TEXTURE_ENV_MODE, GL13.GL_COMBINE)
+ GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_COMBINE_RGB, GL11.GL_REPLACE)
+ GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_SOURCE0_RGB, GL13.GL_CONSTANT)
+ GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_OPERAND0_RGB, GL11.GL_SRC_COLOR)
+ GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_COMBINE_ALPHA, GL11.GL_REPLACE)
+ GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_SOURCE0_ALPHA, GL11.GL_TEXTURE)
+ GL11.glTexEnvi(GL11.GL_TEXTURE_ENV, GL13.GL_OPERAND0_ALPHA, GL11.GL_SRC_ALPHA)
// Render x-ray outlines first, ignoring the depth buffer bit
if (!isXrayCacheEmpty()) {
@@ -293,7 +293,7 @@ object EntityOutlineRenderer {
// Only render the view entity when sleeping or in 3rd person mode
if (entity === mc.renderViewEntity &&
!(mc.renderViewEntity is EntityLivingBase && (mc.renderViewEntity as EntityLivingBase).isPlayerSleeping ||
- mc.gameSettings.thirdPersonView != 0)
+ mc.gameSettings.thirdPersonView != 0)
) {
false
} else mc.theWorld.isBlockLoaded(BlockPos(entity)) && (mc.renderManager.shouldRender(
@@ -361,7 +361,7 @@ object EntityOutlineRenderer {
*/
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
- if (!(event.phase == EventPriority.NORMAL && isEnabled())) return;
+ if (!(event.phase == EventPriority.NORMAL && isEnabled())) return
val renderGlobal = try {
mc.renderGlobal as CustomRenderGlobal
@@ -406,4 +406,4 @@ object EntityOutlineRenderer {
var noXrayCache: HashMap<Entity, Int>?,
var noOutlineCache: HashSet<Entity>?
)
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
index c485ec20b..5e4a63452 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt
@@ -180,7 +180,15 @@ object GuiRenderUtils {
)
}
- fun renderItemAndTip(list: MutableList<String>, item: ItemStack?, x: Int, y: Int, mouseX: Int, mouseY: Int, color: Int = 0xFF43464B.toInt()) {
+ fun renderItemAndTip(
+ list: MutableList<String>,
+ item: ItemStack?,
+ x: Int,
+ y: Int,
+ mouseX: Int,
+ mouseY: Int,
+ color: Int = 0xFF43464B.toInt()
+ ) {
GuiScreen.drawRect(x, y, x + 16, y + 16, color)
if (item != null) {
renderItemStack(item, x, y)
@@ -276,8 +284,10 @@ object GuiRenderUtils {
}
fun drawScaledRec(left: Int, top: Int, right: Int, bottom: Int, colour: Int, inverseScale: Float) {
- GuiScreen.drawRect((left * inverseScale).toInt(), (top * inverseScale).toInt(),
- (right * inverseScale).toInt(), (bottom * inverseScale).toInt(), colour)
+ GuiScreen.drawRect(
+ (left * inverseScale).toInt(), (top * inverseScale).toInt(),
+ (right * inverseScale).toInt(), (bottom * inverseScale).toInt(), colour
+ )
}
fun renderItemAndBackground(item: ItemStack, x: Int, y: Int, colour: Int) {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
index 2a6b002af..be29569a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/InventoryUtils.kt
@@ -45,7 +45,7 @@ object InventoryUtils {
fun inStorage() = openInventoryName().let {
(it.contains("Storage") && !it.contains("Rift Storage"))
- || it.contains("Ender Chest") || it.contains("Backpack")
+ || it.contains("Ender Chest") || it.contains("Backpack")
}
fun getItemInHand(): ItemStack? = Minecraft.getMinecraft().thePlayer.heldItem
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
index ee373d6b1..3aa432cde 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
@@ -73,9 +73,9 @@ class MinecraftConsoleFilter(private val loggerConfigName: String) : Filter {
}
}
if (loggerName == "AsmHelper" && filterConfig.filterAmsHelperTransformer) {
- if (formattedMessage.startsWith("Transforming class ")) {
- filterConsole("AsmHelper Transforming")
- return Filter.Result.DENY
+ if (formattedMessage.startsWith("Transforming class ")) {
+ filterConsole("AsmHelper Transforming")
+ return Filter.Result.DENY
}
if (filterConfig.filterAsmHelperApplying && formattedMessage.startsWith("Applying AsmWriter ModifyWriter")) {
filterConsole("AsmHelper Applying AsmWriter")
@@ -118,7 +118,7 @@ class MinecraftConsoleFilter(private val loggerConfigName: String) : Filter {
}
}
- if (thrown != null && filterConfig.filterScoreboardErrors) {
+ if (thrown != null && filterConfig.filterScoreboardErrors) {
val cause = thrown.cause
if (cause != null && cause.stackTrace.isNotEmpty()) {
val first = cause.stackTrace[0]
@@ -241,13 +241,25 @@ class MinecraftConsoleFilter(private val loggerConfigName: String) : Filter {
fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
event.move(3, "dev.printUnfilteredDebugs", "dev.minecraftConsoles.printUnfilteredDebugs")
event.move(3, "dev.logUnfilteredFile", "dev.minecraftConsoles.logUnfilteredFile")
- event.move(3, "dev.printUnfilteredDebugsOutsideSkyBlock", "dev.minecraftConsoles.printUnfilteredDebugsOutsideSkyBlock")
+ event.move(
+ 3,
+ "dev.printUnfilteredDebugsOutsideSkyBlock",
+ "dev.minecraftConsoles.printUnfilteredDebugsOutsideSkyBlock"
+ )
event.move(3, "dev.printFilteredReason", "dev.minecraftConsoles.printFilteredReason")
event.move(3, "dev.filterChat", "dev.minecraftConsoles.consoleFilter.filterChat")
event.move(3, "dev.filterGrowBuffer", "dev.minecraftConsoles.consoleFilter.filterGrowBuffer")
event.move(3, "dev.filterUnknownSound", "dev.minecraftConsoles.consoleFilter.filterUnknownSound")
- event.move(3, "dev.filterParticleVillagerHappy", "dev.minecraftConsoles.consoleFilter.filterParticleVillagerHappy")
- event.move(3, "dev.filterAmsHelperTransformer", "dev.minecraftConsoles.consoleFilter.filterAmsHelperTransformer")
+ event.move(
+ 3,
+ "dev.filterParticleVillagerHappy",
+ "dev.minecraftConsoles.consoleFilter.filterParticleVillagerHappy"
+ )
+ event.move(
+ 3,
+ "dev.filterAmsHelperTransformer",
+ "dev.minecraftConsoles.consoleFilter.filterAmsHelperTransformer"
+ )
event.move(3, "dev.filterAsmHelperApplying", "dev.minecraftConsoles.consoleFilter.filterAsmHelperApplying")
event.move(3, "dev.filterBiomeIdBounds", "dev.minecraftConsoles.consoleFilter.filterBiomeIdBounds")
event.move(3, "dev.filterScoreboardErrors", "dev.minecraftConsoles.consoleFilter.filterScoreboardErrors")
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index e5c45bab1..007d9f1d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -185,8 +185,8 @@ object NEUItems {
ErrorManager.logError(
IllegalStateException("Something went wrong!"),
"Encountered an error getting the item for §7$this§c. " +
- "This may be because your NEU repo is outdated. Please ask in the SkyHanni " +
- "Discord if this is the case"
+ "This may be because your NEU repo is outdated. Please ask in the SkyHanni " +
+ "Discord if this is the case"
)
fallbackItem
}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
index c9903ffc2..e8acae501 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
@@ -53,7 +53,9 @@ class ParkourHelper(
if (visible) {
for ((index, location) in locations.withIndex()) {
- if (location.offsetCenter().distanceToPlayer() < detectionRange && Minecraft.getMinecraft().thePlayer.onGround) {
+ if (location.offsetCenter()
+ .distanceToPlayer() < detectionRange && Minecraft.getMinecraft().thePlayer.onGround
+ ) {
current = index
}
}
@@ -146,4 +148,4 @@ class ParkourHelper(
private fun colorForIndex(index: Int) = if (rainbowColor) {
RenderUtils.chromaColor(4.seconds, offset = -index / 12f, brightness = 0.7f)
} else monochromeColor
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
index 326283d92..c9892a9bf 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/SoundUtils.kt
@@ -9,7 +9,7 @@ import net.minecraft.util.ResourceLocation
object SoundUtils {
private val beepSound by lazy { createSound("random.orb", 1f) }
private val clickSound by lazy { createSound("gui.button.press", 1f) }
- private val errorSound by lazy {createSound("mob.endermen.portal", 0f)}
+ private val errorSound by lazy { createSound("mob.endermen.portal", 0f) }
val centuryActiveTimerAlert by lazy { createSound("skyhanni:centurytimer.active", 1f) }
fun ISound.playSound() {
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index 2066b809b..dd114d8fd 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -18,7 +18,8 @@ import java.util.regex.Pattern
object StringUtils {
// TODO USE SH-REPO
private val playerChatPattern = "(?<important>.*?)(?:§[f7r])*: .*".toPattern()
- private val chatUsernamePattern = "^(?:§\\w\\[§\\w\\d+§\\w] )?(?:(?:§\\w)+\\S )?(?<rankedName>(?:§\\w\\[\\w.+] )?(?:§\\w)?(?<username>\\w+))(?: (?:§\\w)?\\[.+?])?".toPattern()
+ private val chatUsernamePattern =
+ "^(?:§\\w\\[§\\w\\d+§\\w] )?(?:(?:§\\w)+\\S )?(?<rankedName>(?:§\\w\\[\\w.+] )?(?:§\\w)?(?<username>\\w+))(?: (?:§\\w)?\\[.+?])?".toPattern()
private val whiteSpaceResetPattern = "^(?:\\s|§r)*|(?:\\s|§r)*$".toPattern()
private val whiteSpacePattern = "^\\s*|\\s*$".toPattern()
private val resetPattern = "(?i)§R".toPattern()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/Timer.kt b/src/main/java/at/hannibal2/skyhanni/utils/Timer.kt
index 55ea90b52..2a6d1f5ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/Timer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/Timer.kt
@@ -11,7 +11,7 @@ class Timer(
private var started: SimpleTimeMark = SimpleTimeMark.now(),
startPaused: Boolean = false
-): Comparable<Timer> {
+) : Comparable<Timer> {
@Expose
private var paused: SimpleTimeMark? = null
@@ -40,4 +40,4 @@ class Timer(
override fun compareTo(other: Timer): Int = remaining.compareTo(other.remaining)
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java
index 6ab663941..8e5648f5e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java
@@ -1,4 +1,5 @@
package at.hannibal2.skyhanni.utils.jsonobjects;
+
import com.google.gson.annotations.Expose;
import java.util.List;
@@ -6,4 +7,4 @@ import java.util.List;
public class ContributorListJson {
@Expose
public List<String> usernames;
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
index bc877658a..d2173c74b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
@@ -27,11 +27,11 @@ public class MayorJson {
@Override
public String toString() {
return "Candidate{" +
- "key='" + key + '\'' +
- ", name='" + name + '\'' +
- ", perks=" + perks +
- ", votes=" + votes +
- '}';
+ "key='" + key + '\'' +
+ ", name='" + name + '\'' +
+ ", perks=" + perks +
+ ", votes=" + votes +
+ '}';
}
}
@@ -62,9 +62,9 @@ public class MayorJson {
@Override
public String toString() {
return "Perk{" +
- "name='" + name + '\'' +
- ", description='" + description + '\'' +
- '}';
+ "name='" + name + '\'' +
+ ", description='" + description + '\'' +
+ '}';
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java
index 52ed7f636..8053e87cb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java
+++ b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java
@@ -9,7 +9,8 @@ import java.util.Map;
public class SeaCreatureJson {
- public static Type TYPE = new TypeToken<Map<String, SeaCreatureJson.Variant>>(){}.getType();
+ public static Type TYPE = new TypeToken<Map<String, SeaCreatureJson.Variant>>() {
+ }.getType();
public static class Variant {
@Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
index 2a3321abc..552e1a069 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt
@@ -21,7 +21,7 @@ interface Renderable {
val height: Int
fun isHovered(posX: Int, posY: Int) = currentRenderPassMousePosition?.let { (x, y) ->
x in (posX..posX + width)
- && y in (posY..posY + height) // TODO: adjust for variable height?
+ && y in (posY..posY + height) // TODO: adjust for variable height?
} ?: false
/**
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
index f198f7e7a..7fb13ab86 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
@@ -30,7 +30,7 @@ abstract class Shader(vertex: String, fragment: String) {
if (linkStatus == GL11.GL_FALSE) {
LorenzUtils.consoleLog(
"Error occurred when linking program with Vertex Shader: $vertex and Fragment Shader: $fragment : " +
- StringUtils.trim(ShaderHelper.glGetProgramInfoLog(shaderProgram, 1024))
+ StringUtils.trim(ShaderHelper.glGetProgramInfoLog(shaderProgram, 1024))
)
}
@@ -52,4 +52,4 @@ abstract class Shader(vertex: String, fragment: String) {
fun <T> registerUniform(uniformType: Uniform.UniformType<T>, name: String, uniformValuesSupplier: Supplier<T>) {
uniforms.add(Uniform(this, uniformType, name, uniformValuesSupplier))
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
index e554a4098..790550103 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderHelper.kt
@@ -27,9 +27,9 @@ class ShaderHelper {
// Check OpenGL 2.0 Capabilities
val openGL20supported = capabilities.OpenGL20
SHADERS_SUPPORTED = openGL20supported ||
- capabilities.GL_ARB_vertex_shader &&
- capabilities.GL_ARB_fragment_shader &&
- capabilities.GL_ARB_shader_objects
+ capabilities.GL_ARB_vertex_shader &&
+ capabilities.GL_ARB_fragment_shader &&
+ capabilities.GL_ARB_shader_objects
var log = "Shaders are"
if (!SHADERS_SUPPORTED) log += " not"
@@ -67,12 +67,18 @@ class ShaderHelper {
if (USING_ARB_SHADERS) ARBShaderObjects.glLinkProgramARB(program) else GL20.glLinkProgram(program)
}
- fun glGetProgramInfoLog(program: Int, maxLength: Int) : String {
- return if (USING_ARB_SHADERS) ARBShaderObjects.glGetInfoLogARB(program, maxLength) else GL20.glGetProgramInfoLog(program, maxLength)
+ fun glGetProgramInfoLog(program: Int, maxLength: Int): String {
+ return if (USING_ARB_SHADERS) ARBShaderObjects.glGetInfoLogARB(
+ program,
+ maxLength
+ ) else GL20.glGetProgramInfoLog(program, maxLength)
}
- fun glGetProgrami(program: Int, pname: Int) : Int {
- return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(program, pname) else GL20.glGetProgrami(program, pname)
+ fun glGetProgrami(program: Int, pname: Int): Int {
+ return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(
+ program,
+ pname
+ ) else GL20.glGetProgrami(program, pname)
}
fun glUseProgram(program: Int) {
@@ -80,27 +86,39 @@ class ShaderHelper {
}
fun glAttachShader(program: Int, shaderIn: Int) {
- if (USING_ARB_SHADERS) ARBShaderObjects.glAttachObjectARB(program, shaderIn) else GL20.glAttachShader(program, shaderIn)
+ if (USING_ARB_SHADERS) ARBShaderObjects.glAttachObjectARB(program, shaderIn) else GL20.glAttachShader(
+ program,
+ shaderIn
+ )
}
- fun glCreateShader(type: Int) : Int {
+ fun glCreateShader(type: Int): Int {
return if (USING_ARB_SHADERS) ARBShaderObjects.glCreateShaderObjectARB(type) else GL20.glCreateShader(type)
}
fun glShaderSource(shader: Int, source: CharSequence) {
- if (USING_ARB_SHADERS) ARBShaderObjects.glShaderSourceARB(shader, source) else GL20.glShaderSource(shader, source)
+ if (USING_ARB_SHADERS) ARBShaderObjects.glShaderSourceARB(shader, source) else GL20.glShaderSource(
+ shader,
+ source
+ )
}
fun glCompileShader(shader: Int) {
if (USING_ARB_SHADERS) ARBShaderObjects.glCompileShaderARB(shader) else GL20.glCompileShader(shader)
}
- fun glGetShaderi(shader: Int, pname: Int) : Int {
- return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(shader, pname) else GL20.glGetShaderi(shader, pname)
+ fun glGetShaderi(shader: Int, pname: Int): Int {
+ return if (USING_ARB_SHADERS) ARBShaderObjects.glGetObjectParameteriARB(
+ shader,
+ pname
+ ) else GL20.glGetShaderi(shader, pname)
}
- fun glGetShaderInfoLog(shader: Int, maxLength: Int) : String {
- return if (USING_ARB_SHADERS) ARBShaderObjects.glGetInfoLogARB(shader, maxLength) else GL20.glGetShaderInfoLog(shader, maxLength)
+ fun glGetShaderInfoLog(shader: Int, maxLength: Int): String {
+ return if (USING_ARB_SHADERS) ARBShaderObjects.glGetInfoLogARB(
+ shader,
+ maxLength
+ ) else GL20.glGetShaderInfoLog(shader, maxLength)
}
fun glDeleteShader(shader: Int) {
@@ -112,13 +130,21 @@ class ShaderHelper {
}
fun glUniform3f(location: Int, v0: Float, v1: Float, v2: Float) {
- if (USING_ARB_SHADERS) ARBShaderObjects.glUniform3fARB(location, v0, v1, v2) else GL20.glUniform3f(location, v0, v1, v2)
+ if (USING_ARB_SHADERS) ARBShaderObjects.glUniform3fARB(location, v0, v1, v2) else GL20.glUniform3f(
+ location,
+ v0,
+ v1,
+ v2
+ )
}
- fun glGetUniformLocation(program: Int, name: CharSequence) : Int {
- return if (USING_ARB_SHADERS) ARBShaderObjects.glGetUniformLocationARB(program, name) else GL20.glGetUniformLocation(program, name)
+ fun glGetUniformLocation(program: Int, name: CharSequence): Int {
+ return if (USING_ARB_SHADERS) ARBShaderObjects.glGetUniformLocationARB(
+ program,
+ name
+ ) else GL20.glGetUniformLocation(program, name)
}
fun areShadersSupported() = SHADERS_SUPPORTED
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
index e7eb48f11..3dbec3c6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt
@@ -21,7 +21,7 @@ object ShaderManager {
CHROMA(ChromaShader.INSTANCE);
companion object {
- fun getShaderInstance(shaderName: String) : Shader? = when (shaderName) {
+ fun getShaderInstance(shaderName: String): Shader? = when (shaderName) {
"chroma" -> CHROMA.shader
else -> {
null
@@ -58,7 +58,7 @@ object ShaderManager {
activeShader = null
}
- fun loadShader(type: ShaderType, fileName: String) : Int {
+ fun loadShader(type: ShaderType, fileName: String): Int {
val resourceLocation = ResourceLocation("skyhanni:shaders/$fileName${type.extension}")
val source = StringBuilder()
@@ -73,8 +73,10 @@ object ShaderManager {
ShaderHelper.glCompileShader(shaderID)
if (ShaderHelper.glGetShaderi(shaderID, ShaderHelper.GL_COMPILE_STATUS) == 0) {
- LorenzUtils.consoleLog("Error occurred when compiling shader $fileName${type.extension} : " +
- StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderID, 1024)))
+ LorenzUtils.consoleLog(
+ "Error occurred when compiling shader $fileName${type.extension} : " +
+ StringUtils.trim(ShaderHelper.glGetShaderInfoLog(shaderID, 1024))
+ )
}
return shaderID
@@ -84,4 +86,4 @@ object ShaderManager {
enum class ShaderType(val extension: String, val shaderType: Int) {
VERTEX(".vsh", ShaderHelper.GL_VERTEX_SHADER),
FRAGMENT(".fsh", ShaderHelper.GL_FRAGMENT_SHADER)
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt
index e87ea3b22..d57398ea4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt
@@ -37,9 +37,10 @@ class Uniform<T>(
val values = newUniformValue as FloatArray
ShaderHelper.glUniform3f(uniformID, values[0], values[1], values[2])
}
+
UniformType.BOOL -> ShaderHelper.glUniform1f(uniformID, if (newUniformValue as Boolean) 1f else 0f)
}
previousUniformValue = newUniformValue
}
}
-} \ No newline at end of file
+}