Update buildscript & apply automatic formatting rules

This commit is contained in:
Raven Szewczyk authored and Jason Mitchell committed 2022-06-27 10:23:18 -07:00
1 parent a7683b885d
commit f7a900e910
173 files changed
+4581 -5321

No files matched your search

@@ -3,8 +3,7 @@ package codechicken.nei.config;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.input.Keyboard;
public class OptionKeyBind extends OptionButton
{
public class OptionKeyBind extends OptionButton {
private boolean hasFocus = false;
public OptionKeyBind(String name) {
@@ -38,12 +37,10 @@ public class OptionKeyBind extends OptionButton
}
public boolean conflicted() {
if (getValue() == 0)
return false;
if (getValue() == 0) return false;
for (Option o : slot.options)
if (o instanceof OptionKeyBind && o != this && ((OptionKeyBind) o).getValue() == getValue())
return true;
if (o instanceof OptionKeyBind && o != this && ((OptionKeyBind) o).getValue() == getValue()) return true;
return false;
}
@@ -64,10 +61,10 @@ public class OptionKeyBind extends OptionButton
@Override
public String getButtonText() {
if (hasFocus)
return EnumChatFormatting.WHITE + "> " + EnumChatFormatting.YELLOW + "??? " + EnumChatFormatting.WHITE + "<";
return EnumChatFormatting.WHITE + "> " + EnumChatFormatting.YELLOW + "??? " + EnumChatFormatting.WHITE
+ "<";
if (conflicted())
return EnumChatFormatting.RED + Keyboard.getKeyName(getValue());
if (conflicted()) return EnumChatFormatting.RED + Keyboard.getKeyName(getValue());
return Keyboard.getKeyName(getValue());
}