aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorThatGravyBoat <ThatGravyBoat@users.noreply.github.com>2021-07-15 04:07:36 +0000
committerGitHub Action <actions@github.com>2021-07-15 04:07:36 +0000
commit4e4058da31c3575b69c69d2d7bb3c9af29e248dc (patch)
treed46d48754f080386e23bb86e884580fed0f555f3 /src/main/java
parent718740e85f48b57bf712a62f811cd4d34dd98450 (diff)
downloadskyblockhud-4e4058da31c3575b69c69d2d7bb3c9af29e248dc.tar.gz
skyblockhud-4e4058da31c3575b69c69d2d7bb3c9af29e248dc.tar.bz2
skyblockhud-4e4058da31c3575b69c69d2d7bb3c9af29e248dc.zip
Prettified Code!
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java8
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/Utils.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java1
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java9
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java30
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java58
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java20
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java23
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElement.java4
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementBoolean.java44
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementColour.java237
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/GuiElementTextField.java336
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/Config.java4
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/KeybindHelper.java25
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/annotations/ConfigEditorKeybind.java2
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditor.java22
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorAccordion.java20
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorBoolean.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorButton.java19
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorColour.java36
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDraggableList.java148
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorDropdown.java79
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorKeybind.java31
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorSlider.java97
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiOptionEditorText.java34
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/gui/GuiPositionEditor.java55
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/config/struct/ConfigProcessor.java89
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/GuiElementSlider.java58
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/StringUtils.java1
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpUtils.java11
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingFloat.java16
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/lerp/LerpingInteger.java16
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/core/util/render/TextRenderUtils.java20
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/handlers/SlayerHandler.java4
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/mixins/MixinNetHandlerPlayClient.java7
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/overlay/GenericOverlays.java6
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerFileLoader.java66
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerHandler.java13
-rw-r--r--src/main/java/com/thatgravyboat/skyblockhud/tracker/TrackerObject.java8
40 files changed, 777 insertions, 904 deletions
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
index 1cb00bb..7e1f215 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
@@ -129,21 +129,19 @@ public class SkyblockHud {
// DISABLE UNTIL NEW SYSTEM
@EventHandler
- public void loadComplete(FMLLoadCompleteEvent event){
+ public void loadComplete(FMLLoadCompleteEvent event) {
TrackerFileLoader.loadTrackersFile();
- if (TrackerFileLoader.loadTrackerStatsFile(configDirectory)){
+ if (TrackerFileLoader.loadTrackerStatsFile(configDirectory)) {
TrackerFileLoader.saveTrackerStatsFile(configDirectory);
}
}
@SubscribeEvent
- public void onLeaveServer(FMLNetworkEvent.ClientDisconnectionFromServerEvent event){
+ public void onLeaveServer(FMLNetworkEvent.ClientDisconnectionFromServerEvent event) {
TrackerFileLoader.saveTrackerStatsFile(configDirectory);
}
-
-
public static boolean hasSkyblockScoreboard() {
Minecraft mc = Minecraft.getMinecraft();
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/Utils.java b/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
index 157077b..f65af86 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/Utils.java
@@ -361,6 +361,6 @@ public class Utils {
public static String formattedNumber(int number, int numberToFormatAt) {
DecimalFormat formatter = new DecimalFormat("#.#", DecimalFormatSymbols.getInstance(Locale.CANADA));
formatter.setRoundingMode(RoundingMode.FLOOR);
- return number > numberToFormatAt-1 ? formatter.format((double) number / 1000) + "k" : String.valueOf(number);
+ return number > numberToFormatAt - 1 ? formatter.format((double) number / 1000) + "k" : String.valueOf(number);
}
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java
index 15fb01a..61f8d82 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/events/SkyBlockEntityKilled.java
@@ -7,6 +7,7 @@ import net.minecraftforge.fml.common.eventhandler.Event;
public class SkyBlockEntityKilled extends Event {
public String id;
+
@Nullable
public Entity entity;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java
index 8dc63c8..bb14e5d 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/api/sbentities/EntityTypeHelper.java
@@ -21,17 +21,14 @@ public class EntityTypeHelper {
return false;
}
- public static boolean isCrypt(Entity entity){
+ public static boolean isCrypt(Entity entity) {
if (entity instanceof EntityZombie) {
EntityZombie zombie = ((EntityZombie) entity);
double maxHealthBase = zombie.getAttributeMap().getAttributeInstanceByName("generic.maxHealth").getBaseValue();
if (maxHealthBase != 2000d) return false;
- if (zombie.getEquipmentInSlot(0) == null || !zombie.getEquipmentInSlot(0).getItem().equals(Items.iron_sword))
- return false;
- if (zombie.getEquipmentInSlot(1) == null || !zombie.getEquipmentInSlot(1).getItem().equals(Items.chainmail_boots))
- return false;
- if (zombie.getEquipmentInSlot(2) == null || !zombie.getEquipmentInSlot(2).getItem().equals(Items.chainmail_leggings))
- return false;
+ if (zombie.getEquipmentInSlot(0) == null || !zombie.getEquipmentInSlot(0).getItem().equals(Items.iron_sword)) return false;
+ if (zombie.getEquipmentInSlot(1) == null || !zombie.getEquipmentInSlot(1).getItem().equals(Items.chainmail_boots)) return false;
+ if (zombie.getEquipmentInSlot(2) == null || !zombie.getEquipmentInSlot(2).getItem().equals(Items.chainmail_leggings)) return false;
return zombie.getEquipmentInSlot(3) != null && zombie.getEquipmentInSlot(3).getItem().equals(Items.chainmail_chestplate);
}
return false;
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
index 9b42192..04d4a8c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
@@ -96,13 +96,8 @@ public class SBHConfig extends Config {
public boolean hideScoreboard = false;
@Expose
- @ConfigOption(
- name = "Bar Textures",
- desc = "Change the style of bars. Dont change this unless the pack ur using tells you can."
- )
- @ConfigEditorDropdown(
- values = {"Style 1", "Style 2"}
- )
+ @ConfigOption(name = "Bar Textures", desc = "Change the style of bars. Dont change this unless the pack ur using tells you can.")
+ @ConfigEditorDropdown(values = { "Style 1", "Style 2" })
public int barTexture = 0;
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
index 90325f8..1130370 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfigEditor.java
@@ -1,5 +1,8 @@
package com.thatgravyboat.skyblockhud.config;
+import static com.thatgravyboat.skyblockhud.GuiTextures.DISCORD;
+import static com.thatgravyboat.skyblockhud.GuiTextures.TWITTER;
+
import com.google.common.collect.Lists;
import com.thatgravyboat.skyblockhud.core.GlScissorStack;
import com.thatgravyboat.skyblockhud.core.GuiElement;
@@ -13,8 +16,8 @@ import com.thatgravyboat.skyblockhud.core.util.render.RenderUtils;
import com.thatgravyboat.skyblockhud.core.util.render.TextRenderUtils;
import java.awt.*;
import java.net.URI;
-import java.util.List;
import java.util.*;
+import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
@@ -25,9 +28,6 @@ import net.minecraft.util.ResourceLocation;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
-import static com.thatgravyboat.skyblockhud.GuiTextures.DISCORD;
-import static com.thatgravyboat.skyblockhud.GuiTextures.TWITTER;
-
public class SBHConfigEditor extends GuiElement {
private static final ResourceLocation[] socialsIco = new ResourceLocation[] { DISCORD, TWITTER };
@@ -237,11 +237,11 @@ public class SBHConfigEditor extends GuiElement {
for (ConfigProcessor.ProcessedOption option : getOptionsInCategory(cat).values()) {
int optionWidth = optionWidthDefault;
if (option.accordionId >= 0) {
- if(!activeAccordions.containsKey(option.accordionId)) {
+ if (!activeAccordions.containsKey(option.accordionId)) {
continue;
}
int accordionDepth = activeAccordions.get(option.accordionId);
- optionWidth = optionWidthDefault - (2 * innerPadding)*(accordionDepth + 1);
+ optionWidth = optionWidthDefault - (2 * innerPadding) * (accordionDepth + 1);
}
GuiOptionEditor editor = option.editor;
@@ -253,7 +253,7 @@ public class SBHConfigEditor extends GuiElement {
if (accordion.getToggled()) {
int accordionDepth = 0;
if (option.accordionId >= 0) {
- accordionDepth = activeAccordions.get(option.accordionId)+1;
+ accordionDepth = activeAccordions.get(option.accordionId) + 1;
}
activeAccordions.put(accordion.getAccordionId(), accordionDepth);
}
@@ -300,7 +300,7 @@ public class SBHConfigEditor extends GuiElement {
if (accordion.getToggled()) {
int accordionDepth = 0;
if (option.accordionId >= 0) {
- accordionDepth = activeAccordions.get(option.accordionId)+1;
+ accordionDepth = activeAccordions.get(option.accordionId) + 1;
}
activeAccordions.put(accordion.getAccordionId(), accordionDepth);
}
@@ -431,7 +431,7 @@ public class SBHConfigEditor extends GuiElement {
if (accordion.getToggled()) {
int accordionDepth = 0;
if (option.accordionId >= 0) {
- accordionDepth = activeAccordions.get(option.accordionId)+1;
+ accordionDepth = activeAccordions.get(option.accordionId) + 1;
}
activeAccordions.put(accordion.getAccordionId(), accordionDepth);
}
@@ -491,7 +491,7 @@ public class SBHConfigEditor extends GuiElement {
continue;
}
int accordionDepth = activeAccordions.get(option.accordionId);
- optionWidth = optionWidthDefault - (2*innerPadding)*(accordionDepth+1);
+ optionWidth = optionWidthDefault - (2 * innerPadding) * (accordionDepth + 1);
}
GuiOptionEditor editor = option.editor;
@@ -503,7 +503,7 @@ public class SBHConfigEditor extends GuiElement {
if (accordion.getToggled()) {
int accordionDepth = 0;
if (option.accordionId >= 0) {
- accordionDepth = activeAccordions.get(option.accordionId)+1;
+ accordionDepth = activeAccordions.get(option.accordionId) + 1;
}
activeAccordions.put(accordion.getAccordionId(), accordionDepth);
}
@@ -528,7 +528,7 @@ public class SBHConfigEditor extends GuiElement {
continue;
}
int accordionDepth = activeAccordions.get(option.accordionId);
- optionWidth = optionWidthDefault - (2*innerPadding)*(accordionDepth+1);
+ optionWidth = optionWidthDefault - (2 * innerPadding) * (accordionDepth + 1);
}
GuiOptionEditor editor = option.editor;
@@ -540,7 +540,7 @@ public class SBHConfigEditor extends GuiElement {
if (accordion.getToggled()) {
int accordionDepth = 0;
if (option.accordionId >= 0) {
- accordionDepth = activeAccordions.get(option.accordionId)+1;
+ accordionDepth = activeAccordions.get(option.accordionId) + 1;
}
activeAccordions.put(accordion.getAccordionId(), accordionDepth);
}
@@ -586,7 +586,7 @@ public class SBHConfigEditor extends GuiElement {
if (accordion.getToggled()) {
int accordionDepth = 0;
if (option.accordionId >= 0) {
- accordionDepth = activeAccordions.get(option.accordionId)+1;
+ accordionDepth = activeAccordions.get(option.accordionId) + 1;
}
activeAccordions.put(accordion.getAccordionId(), accordionDepth);
}
@@ -599,4 +599,4 @@ public class SBHConfigEditor extends GuiElement {
return true;
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java b/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java
index f143b97..64f04fe 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/BackgroundBlur.java
@@ -23,6 +23,7 @@ import org.lwjgl.opengl.GL30;
public class BackgroundBlur {
private static class OutputStuff {
+
public Framebuffer framebuffer;
public Shader blurShaderHorz = null;
public Shader blurShaderVert = null;
@@ -41,8 +42,9 @@ public class BackgroundBlur {
private static int fogColour = 0;
private static boolean registered = false;
+
public static void registerListener() {
- if(!registered) {
+ if (!registered) {
registered = true;
MinecraftForge.EVENT_BUS.register(new BackgroundBlur());
}
@@ -69,18 +71,21 @@ public class BackgroundBlur {
int width = Minecraft.getMinecraft().displayWidth;
int height = Minecraft.getMinecraft().displayHeight;
- OutputStuff output = blurOutput.computeIfAbsent(blur, k -> {
- Framebuffer fb = new Framebuffer(width, height, false);
- fb.setFramebufferFilter(GL11.GL_NEAREST);
- return new OutputStuff(fb, null, null);
- });
+ OutputStuff output = blurOutput.computeIfAbsent(
+ blur,
+ k -> {
+ Framebuffer fb = new Framebuffer(width, height, false);
+ fb.setFramebufferFilter(GL11.GL_NEAREST);
+ return new OutputStuff(fb, null, null);
+ }
+ );
- if(output.framebuffer.framebufferWidth != width || output.framebuffer.framebufferHeight != height) {
+ if (output.framebuffer.framebufferWidth != width || output.framebuffer.framebufferHeight != height) {
output.framebuffer.createBindFramebuffer(width, height);
- if(output.blurShaderHorz != null) {
+ if (output.blurShaderHorz != null) {
output.blurShaderHorz.setProjectionMatrix(createProjectionMatrix(width, height));
}
- if(output.blurShaderVert != null) {
+ if (output.blurShaderVert != null) {
output.blurShaderVert.setProjectionMatrix(createProjectionMatrix(width, height));
}
}
@@ -105,7 +110,7 @@ public class BackgroundBlur {
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void onScreenRender(RenderGameOverlayEvent.Pre event) {
- if(event.type == RenderGameOverlayEvent.ElementType.ALL) {
+ if (event.type == RenderGameOverlayEvent.ElementType.ALL) {
processBlurs();
}
}
@@ -141,7 +146,7 @@ public class BackgroundBlur {
}
private static void blurBackground(OutputStuff output, float blurFactor) {
- if(!OpenGlHelper.isFramebufferEnabled() || !OpenGlHelper.areShadersSupported()) return;
+ if (!OpenGlHelper.isFramebufferEnabled() || !OpenGlHelper.areShadersSupported()) return;
int width = Minecraft.getMinecraft().displayWidth;
int height = Minecraft.getMinecraft().displayHeight;
@@ -153,36 +158,34 @@ public class BackgroundBlur {
GlStateManager.loadIdentity();
GlStateManager.translate(0.0F, 0.0F, -2000.0F);
- if(blurOutputHorz == null) {
+ if (blurOutputHorz == null) {
blurOutputHorz = new Framebuffer(width, height, false);
blurOutputHorz.setFramebufferFilter(GL11.GL_NEAREST);
}
- if(blurOutputHorz == null || output == null) {
+ if (blurOutputHorz == null || output == null) {
return;
}
- if(blurOutputHorz.framebufferWidth != width || blurOutputHorz.framebufferHeight != height) {
+ if (blurOutputHorz.framebufferWidth != width || blurOutputHorz.framebufferHeight != height) {
blurOutputHorz.createBindFramebuffer(width, height);
Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
}
- if(output.blurShaderHorz == null) {
+ if (output.blurShaderHorz == null) {
try {
- output.blurShaderHorz = new Shader(Minecraft.getMinecraft().getResourceManager(), "blur",
- output.framebuffer, blurOutputHorz);
+ output.blurShaderHorz = new Shader(Minecraft.getMinecraft().getResourceManager(), "blur", output.framebuffer, blurOutputHorz);
output.blurShaderHorz.getShaderManager().getShaderUniform("BlurDir").set(1, 0);
output.blurShaderHorz.setProjectionMatrix(createProjectionMatrix(width, height));
- } catch(Exception ignored) { }
+ } catch (Exception ignored) {}
}
- if(output.blurShaderVert == null) {
+ if (output.blurShaderVert == null) {
try {
- output.blurShaderVert = new Shader(Minecraft.getMinecraft().getResourceManager(), "blur",
- blurOutputHorz, output.framebuffer);
+ output.blurShaderVert = new Shader(Minecraft.getMinecraft().getResourceManager(), "blur", blurOutputHorz, output.framebuffer);
output.blurShaderVert.getShaderManager().getShaderUniform("BlurDir").set(0, 1);
output.blurShaderVert.setProjectionMatrix(createProjectionMatrix(width, height));
- } catch(Exception ignored) { }
+ } catch (Exception ignored) {}
}
- if(output.blurShaderHorz != null && output.blurShaderVert != null) {
- if(output.blurShaderHorz.getShaderManager().getShaderUniform("Radius") == null) {
+ if (output.blurShaderHorz != null && output.blurShaderVert != null) {
+ if (output.blurShaderHorz.getShaderManager().getShaderUniform("Radius") == null) {
//Corrupted shader?
return;
}
@@ -193,9 +196,7 @@ public class BackgroundBlur {
GL11.glPushMatrix();
GL30.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, Minecraft.getMinecraft().getFramebuffer().framebufferObject);
GL30.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, output.framebuffer.framebufferObject);
- GL30.glBlitFramebuffer(0, 0, width, height,
- 0, 0, output.framebuffer.framebufferWidth, output.framebuffer.framebufferHeight,
- GL11.GL_COLOR_BUFFER_BIT, GL11.GL_NEAREST);
+ GL30.glBlitFramebuffer(0, 0, width, height, 0, 0, output.framebuffer.framebufferWidth, output.framebuffer.framebufferHeight, GL11.GL_COLOR_BUFFER_BIT, GL11.GL_NEAREST);
output.blurShaderHorz.loadShader(0);
output.blurShaderVert.loadShader(0);
@@ -228,7 +229,7 @@ public class BackgroundBlur {
if (blurOutput.isEmpty()) return;
OutputStuff out = blurOutput.get(blurStrength);
- if(out == null) {
+ if (out == null) {
out = blurOutput.values().iterator().next();
}
@@ -245,5 +246,4 @@ public class BackgroundBlur {
out.framebuffer.unbindFramebufferTexture();
GlStateManager.depthMask(true);
}
-
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java b/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java
index b9f4e79..d43e8b9 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/ChromaColour.java
@@ -25,9 +25,8 @@ public class ChromaColour {
int[] arr = new int[split.length];
-
- for(int i=0; i<split.length; i++) {
- arr[i] = Integer.parseInt(split[split.length-1-i], RADIX);
+ for (int i = 0; i < split.length; i++) {
+ arr[i] = Integer.parseInt(split[split.length - 1 - i], RADIX);
}
return arr;
}
@@ -48,15 +47,16 @@ public class ChromaColour {
}
public static float getSecondsForSpeed(int speed) {
- return (255-speed)/254f*(MAX_CHROMA_SECS-MIN_CHROMA_SECS)+MIN_CHROMA_SECS;
+ return (255 - speed) / 254f * (MAX_CHROMA_SECS - MIN_CHROMA_SECS) + MIN_CHROMA_SECS;
}
private static final int MIN_CHROMA_SECS = 1;
private static final int MAX_CHROMA_SECS = 60;
public static long startTime = -1;
+
public static int specialToChromaRGB(String special) {
- if(startTime < 0) startTime = System.currentTimeMillis();
+ if (startTime < 0) startTime = System.currentTimeMillis();
int[] d = decompose(special);
int chr = d[4];
@@ -67,11 +67,11 @@ public class ChromaColour {
float[] hsv = Color.RGBtoHSB(r, g, b, null);
- if(chr > 0) {
+ if (chr > 0) {
float seconds = getSecondsForSpeed(chr);
- hsv[0] += (System.currentTimeMillis()-startTime)/1000f/seconds;
+ hsv[0] += (System.currentTimeMillis() - startTime) / 1000f / seconds;
hsv[0] %= 1;
- if(hsv[0] < 0) hsv[0] += 1;
+ if (hsv[0] < 0) hsv[0] += 1;
}
return (a & 0xFF) << 24 | (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF);
@@ -85,11 +85,9 @@ public class ChromaColour {
float[] hsv = Color.RGBtoHSB(r, g, b, null);
- hsv[0] += degrees/360f;
+ hsv[0] += degrees / 360f;
hsv[0] %= 1;
return (a & 0xFF) << 24 | (Color.HSBtoRGB(hsv[0], hsv[1], hsv[2]) & 0x00FFFFFF);
}
-
-
}
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java b/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java
index 6f21e9a..0e1694e 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/core/GlScissorStack.java
@@ -1,14 +1,14 @@
package com.thatgravyboat.skyblockhud.core;
+import java.util.LinkedList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import org.lwjgl.opengl.GL11;
-import java.util.LinkedList;
-
public class GlScissorStack {
private static class Bounds {
+
int left;
int top;
int right;
@@ -27,10 +27,10 @@ public class GlScissorStack {
right = Math.min(right, this.right);
bottom = Math.min(bottom, this.bottom);
- if(top > bottom) {
+ if (top > bottom) {
top = bottom;
}
- if(left > right) {
+ if (left > right) {
left = right;
}
@@ -40,39 +40,39 @@ public class GlScissorStack {
public void set(ScaledResolution scaledResolution) {
int height = Minecraft.getMinecraft().displayHeight;
int scale = scaledResolution.getScaleFactor();
- GL11.glScissor(left*scale, height-bottom*scale, (right-left)*scale, (bottom-top)*scale);
+ GL11.glScissor(left * scale, height - bottom * scale, (right - left) * scale, (bottom - top) * scale);
}
}
private static final LinkedList<Bounds> boundsStack = new LinkedList<>();
public static void push(int left, int top, int right, int bottom, ScaledResolution scaledResolution) {
- if(right < left) {
+ if (right < left) {
int temp = right;
right = left;
left = temp;
}
- if(bottom < top) {
+ if (bottom < top) {
int temp = bottom;
bottom = top;
top = temp;
}
- if(boundsStack.isEmpty()) {
+ if (boundsStack.isEmpty()) {
boundsStack.push(new Bounds(left, top, right, bottom));
} else {
boundsStack.push(boundsStack.peek().createSubBound(left, top, right, bottom));
}
- if(!boundsStack.isEmpty()) {
+ if (!boundsStack.isEmpty()) {
boundsStack.peek().set(scaledResolution);
}
GL11.glEnable(GL11.GL_SCISSOR_TEST);
}
public static void pop(ScaledResolution scaledResolution) {
- if(!boundsStack.isEmpty()) {
+ if (!boundsS