chylex/Better-Controls
1
0
Fork 0
mirror of https://github.com/chylex/Better-Controls.git synced 2025-05-07 16:34:06 +02:00
Code

Fix code formatting

Browse Source
This commit is contained in:
chylex 2021-10-02 14:13:12 +02:00
parent dd6ae046b6
commit 145a7d016f
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
42 changed files with 328 additions and 325 deletions

4
src/main/java/chylex/bettercontrols/BetterControlsMod.java
View File

@ -13,10 +13,10 @@ import net.minecraftforge.fmlclient.ConfigGuiHandler.ConfigGuiFactory;
import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
@Mod("bettercontrols")
public final class BetterControlsMod{
public final class BetterControlsMod {
public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
public BetterControlsMod(){
public BetterControlsMod() {
ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
}

12
src/main/java/chylex/bettercontrols/config/BetterControlsConfig.java
View File

@ -3,8 +3,8 @@ import chylex.bettercontrols.input.KeyBindingWithModifier;
import chylex.bettercontrols.input.SprintMode;
import java.nio.file.Path;
public final class BetterControlsConfig{
public static BetterControlsConfig load(final Path path){
public final class BetterControlsConfig {
public static BetterControlsConfig load(final Path path) {
return ConfigSerializer.deserialize(path).setPath(path);
}
@ -37,14 +37,14 @@ public final class BetterControlsConfig{
public final KeyBindingWithModifier keyResetAllToggles = new KeyBindingWithModifier("key.bettercontrols.reset_all_toggles");
public final KeyBindingWithModifier keyOpenMenu = new KeyBindingWithModifier("key.bettercontrols.open_menu");
BetterControlsConfig(){}
BetterControlsConfig() {}
private BetterControlsConfig setPath(final Path path){
private BetterControlsConfig setPath(final Path path) {
this.path = path;
return this;
}
public KeyBindingWithModifier[] getAllKeyBindings(){
public KeyBindingWithModifier[] getAllKeyBindings() {
return new KeyBindingWithModifier[]{
keyToggleSprint,
keyToggleSneak,
@ -56,7 +56,7 @@ public final class BetterControlsConfig{
};
}
public void save(){
public void save() {
ConfigSerializer.serialize(path, this);
}
}

24
src/main/java/chylex/bettercontrols/config/ConfigSerializer.java
View File

@ -21,14 +21,14 @@ import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
import java.nio.file.Path;
final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig>{
final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, JsonDeserializer<BetterControlsConfig> {
private static final Logger logger = LogManager.getLogger();
private static final Gson gson = new GsonBuilder().registerTypeAdapter(BetterControlsConfig.class, new ConfigSerializer()).setPrettyPrinting().create();
private ConfigSerializer(){}
private ConfigSerializer() {}
@Override
public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context){
public JsonElement serialize(final BetterControlsConfig cfg, final Type typeOfSrc, final JsonSerializationContext context) {
final JsonObject obj = new JsonObject();
Json.writeKeyBinding(obj, "Sprint.KeyToggle", cfg.keyToggleSprint);
@ -62,11 +62,11 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
}
@Override
public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException{
public BetterControlsConfig deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
final BetterControlsConfig cfg = new BetterControlsConfig();
final JsonObject obj = json.getAsJsonObject();
if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()){
if (obj.has("Sprint.TapToStop") && obj.get("Sprint.TapToStop").getAsBoolean()) {
cfg.sprintMode = SprintMode.TAP_TO_TOGGLE;
}
@ -100,19 +100,19 @@ final class ConfigSerializer implements JsonSerializer<BetterControlsConfig>, Js
return cfg;
}
static void serialize(final Path path, final BetterControlsConfig config){
try(final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))){
static void serialize(final Path path, final BetterControlsConfig config) {
try (final JsonWriter writer = gson.newJsonWriter(Files.newBufferedWriter(path, StandardCharsets.UTF_8))) {
gson.getAdapter(BetterControlsConfig.class).write(writer, config);
}catch(final IOException e){
} catch (final IOException e) {
logger.error("Error saving BetterControls configuration file!", e);
}
}
static BetterControlsConfig deserialize(final Path path){
try(final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))){
static BetterControlsConfig deserialize(final Path path) {
try (final JsonReader jsonReader = new JsonReader(Files.newBufferedReader(path, StandardCharsets.UTF_8))) {
return gson.getAdapter(BetterControlsConfig.class).read(jsonReader);
}catch(final FileNotFoundException | NoSuchFileException ignored){
}catch(final IOException e){
} catch (final FileNotFoundException | NoSuchFileException ignored) {
} catch (final IOException e) {
logger.error("Error reading BetterControls configuration file!", e);
}

34
src/main/java/chylex/bettercontrols/config/Json.java
View File

@ -4,42 +4,42 @@ import chylex.bettercontrols.input.ModifierKey;
import chylex.bettercontrols.util.Key;
import com.google.gson.JsonObject;
final class Json{
private Json(){}
final class Json {
private Json() {}
static void setFloat(final JsonObject obj, final String key, final float value){
static void setFloat(final JsonObject obj, final String key, final float value) {
obj.addProperty(key, Float.valueOf(value));
}
static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue){
static float getFloat(final JsonObject obj, final String key, final float defaultValue, final float minValue, final float maxValue) {
final float value = obj.has(key) ? obj.get(key).getAsFloat() : defaultValue;
return Math.max(minValue, Math.min(maxValue, value));
}
static void setBool(final JsonObject obj, final String key, final boolean value){
static void setBool(final JsonObject obj, final String key, final boolean value) {
obj.addProperty(key, Boolean.valueOf(value));
}
static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue){
static boolean getBool(final JsonObject obj, final String key, final boolean defaultValue) {
return obj.has(key) ? obj.get(key).getAsBoolean() : defaultValue;
}
static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value){
static <T extends Enum<T>> void setEnum(final JsonObject obj, final String key, final T value) {
obj.addProperty(key, value.name());
}
static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass){
if (!obj.has(key)){
static <T extends Enum<T>> T getEnum(final JsonObject obj, final String key, final T defaultValue, final Class<T> enumClass) {
if (!obj.has(key)) {
return defaultValue;
}
final T[] constants = enumClass.getEnumConstants();
if (constants != null){
if (constants != null) {
final String value = obj.get(key).getAsString();
for(final T constant : constants){
if (constant.name().equalsIgnoreCase(value)){
for (final T constant : constants) {
if (constant.name().equalsIgnoreCase(value)) {
return constant;
}
}
@ -51,20 +51,20 @@ final class Json{
private static final String KEY_SUFFIX = ".Key";
private static final String MOD_SUFFIX = ".Mod";
static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
static void writeKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
obj.addProperty(key + KEY_SUFFIX, Key.writeBinding(keyBinding));
if (keyBinding.getModifier() != null){
if (keyBinding.getModifier() != null) {
obj.addProperty(key + MOD_SUFFIX, Integer.valueOf(keyBinding.getModifier().id));
}
}
static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding){
if (obj.has(key + KEY_SUFFIX)){
static void readKeyBinding(final JsonObject obj, final String key, final KeyBindingWithModifier keyBinding) {
if (obj.has(key + KEY_SUFFIX)) {
Key.readBinding(keyBinding, obj.get(key + KEY_SUFFIX).getAsString());
}
if (obj.has(key + MOD_SUFFIX)){
if (obj.has(key + MOD_SUFFIX)) {
keyBinding.setModifier(ModifierKey.getById(obj.get(key + MOD_SUFFIX).getAsInt()));
}
}

46
src/main/java/chylex/bettercontrols/gui/BetterControlsScreen.java
View File

@ -33,7 +33,7 @@ import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
import static chylex.bettercontrols.util.LiteralText.text;
import static chylex.bettercontrols.util.Statics.OPTIONS;
public class BetterControlsScreen extends OptionsSubScreen{
public class BetterControlsScreen extends OptionsSubScreen {
public static final LiteralText TITLE = text("Better Controls");
private static final int BOTTOM_PADDING = 3;
@ -49,7 +49,7 @@ public class BetterControlsScreen extends OptionsSubScreen{
// Options
private int generateSprintingOptions(int y, final List<GuiEventListener> elements){
private int generateSprintingOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
@ -73,7 +73,7 @@ public class BetterControlsScreen extends OptionsSubScreen{
return y;
}
private int generateSneakingOptions(int y, final List<GuiEventListener> elements){
private int generateSneakingOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
@ -88,7 +88,7 @@ public class BetterControlsScreen extends OptionsSubScreen{
}
@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
private int generateFlightOptions(int y, final List<GuiEventListener> elements){
private int generateFlightOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
final List<Option<Float>> flightSpeedOptions = Arrays.asList(
@ -173,7 +173,7 @@ public class BetterControlsScreen extends OptionsSubScreen{
return y;
}
private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements){
private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements) {
final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
@ -203,7 +203,7 @@ public class BetterControlsScreen extends OptionsSubScreen{
new Option<>(ModifierKey.ALT, text("Alt"))
);
private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final LiteralText text, final KeyBindingWithModifier binding){
private void generateKeyBindingWithModifierOption(final int y, final List<GuiEventListener> elements, final LiteralText text, final KeyBindingWithModifier binding) {
final CycleButtonWidget<ModifierKey> modifierButton = new CycleButtonWidget<>(col4(2), y, COL4_W, MODIFIER_OPTIONS, binding.getModifier(), binding::setModifier);
final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding);
bindingButton.linkButtonToBoundState(modifierButton);
@ -214,7 +214,7 @@ public class BetterControlsScreen extends OptionsSubScreen{
allKeyBindings.add(bindingButton);
}
private static void generateLeftSideText(final int y, final List<GuiEventListener> elements, final LiteralText text){
private static void generateLeftSideText(final int y, final List<GuiEventListener> elements, final LiteralText text) {
elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
}
@ -224,12 +224,12 @@ public class BetterControlsScreen extends OptionsSubScreen{
private KeyBindingWidget editingKeyBinding;
private final List<KeyBindingWidget> allKeyBindings = new ArrayList<>();
public BetterControlsScreen(@Nullable final Screen parentScreen){
public BetterControlsScreen(@Nullable final Screen parentScreen) {
super(parentScreen, OPTIONS, TITLE);
}
@Override
public void init(){
public void init() {
allKeyBindings.clear();
final List<GuiEventListener> elements = new ArrayList<>();
@ -252,20 +252,20 @@ public class BetterControlsScreen extends OptionsSubScreen{
}
@Override
public void removed(){
public void removed() {
BetterControlsMod.config.save();
}
@Override
public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta){
public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
renderBackground(matrices);
optionsWidget.render(matrices, mouseX, mouseY, delta);
drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
super.render(matrices, mouseX, mouseY, delta);
}
private void startEditingKeyBinding(final KeyBindingWidget widget){
if (editingKeyBinding != null){
private void startEditingKeyBinding(final KeyBindingWidget widget) {
if (editingKeyBinding != null) {
editingKeyBinding.stopEditing();
}
@ -273,40 +273,40 @@ public class BetterControlsScreen extends OptionsSubScreen{
}
@Override
public boolean mouseClicked(final double mouseX, final double mouseY, final int button){
if (editingKeyBinding != null){
public boolean mouseClicked(final double mouseX, final double mouseY, final int button) {
if (editingKeyBinding != null) {
editingKeyBinding.bindAndStopEditing(Key.inputFromMouse(button));
onKeyBindingEditingFinished();
return true;
}
else{
else {
return super.mouseClicked(mouseX, mouseY, button);
}
}
@Override
public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers){
if (editingKeyBinding != null){
if (keyCode == GLFW.GLFW_KEY_ESCAPE){
public boolean keyPressed(final int keyCode, final int scanCode, final int modifiers) {
if (editingKeyBinding != null) {
if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
editingKeyBinding.bindAndStopEditing(Key.INVALID);
}
else{
else {
editingKeyBinding.bindAndStopEditing(Key.inputFromKeyboard(keyCode, scanCode));
}
onKeyBindingEditingFinished();
return true;
}
else{
else {
return super.keyPressed(keyCode, scanCode, modifiers);
}
}
private void onKeyBindingEditingFinished(){
private void onKeyBindingEditingFinished() {
editingKeyBinding = null;
KeyMapping.resetMapping();
for(final KeyBindingWidget widget : allKeyBindings){
for (final KeyBindingWidget widget : allKeyBindings) {
widget.updateKeyBindingText();
}
}

46
src/main/java/chylex/bettercontrols/gui/OptionListWidget.java
View File

@ -14,83 +14,83 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class OptionListWidget extends ContainerObjectSelectionList<Entry>{
public final class OptionListWidget extends ContainerObjectSelectionList<Entry> {
public static final int ROW_WIDTH = 408;
public static final int ROW_PADDING = 2;
public static final int COL2_W = (ROW_WIDTH / 2) - ROW_PADDING;
public static final int COL4_W = (ROW_WIDTH / 4) - ROW_PADDING;
public static int col2(final int column){
public static int col2(final int column) {
return (column * ROW_WIDTH) / 2;
}
public static int col4(final int column){
public static int col4(final int column) {
return (column * ROW_WIDTH) / 4;
}
private static Offset getElementOffset(final GuiEventListener element){
if (element instanceof OptionWidget){
private static Offset getElementOffset(final GuiEventListener element) {
if (element instanceof OptionWidget) {
return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
}
else if (element instanceof AbstractWidget){
else if (element instanceof AbstractWidget) {
return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
}
else{
else {
return new Offset(0, 0);
}
}
public interface OptionWidget extends GuiEventListener, Widget{
public interface OptionWidget extends GuiEventListener, Widget {
int getX();
int getY();
void setX(int x);
void setY(int y);
}
private static final class Offset{
private static final class Offset {
public final int x;
public final int y;
private Offset(final int x, final int y){
private Offset(final int x, final int y) {
this.x = x;
this.y = y;
}
}
public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight){
public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<GuiEventListener> widgets, final int innerHeight) {
super(MINECRAFT, width, height, top, bottom, innerHeight);
addEntry(new Entry(widgets));
}
@Override
public int getRowLeft(){
public int getRowLeft() {
return super.getRowLeft() - ROW_PADDING;
}
@Override
public int getRowWidth(){
public int getRowWidth() {
return ROW_WIDTH;
}
@Override
protected int getScrollbarPosition(){
protected int getScrollbarPosition() {
return (width + ROW_WIDTH) / 2 + 4;
}
protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry>{
protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry> {
private final List<GuiEventListener> elements;
private final List<NarratableEntry> narratables;
private final Map<GuiEventListener, Offset> offsets;
public Entry(final List<GuiEventListener> elements){
public Entry(final List<GuiEventListener> elements) {
this.elements = new ArrayList<>(elements);
this.narratables = elements.stream().filter(e -> e instanceof NarratableEntry).map(e -> (NarratableEntry) e).collect(Collectors.toList());
this.narratables = elements.stream().filter(e -> e instanceof NarratableEntry).map(e -> (NarratableEntry)e).collect(Collectors.toList());
this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
}
@Override
public List<? extends GuiEventListener> children(){
public List<? extends GuiEventListener> children() {
return Collections.unmodifiableList(elements);
}
@ -100,22 +100,22 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>{
}
@Override
public void render(final PoseStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta){
for(final GuiEventListener element : elements){
public void render(final PoseStack matrices, final int index, final int y, final int x, final int entryWidth, final int entryHeight, final int mouseX, final int mouseY, final boolean hovered, final float tickDelta) {
for (final GuiEventListener element : elements) {
final Offset offset = offsets.get(element);
if (element instanceof AbstractWidget){
if (element instanceof AbstractWidget) {
final AbstractWidget button = (AbstractWidget)element;
button.x = x + offset.x;
button.y = y + offset.y;
}
else if (element instanceof OptionWidget){
else if (element instanceof OptionWidget) {
final OptionWidget widget = (OptionWidget)element;
widget.setX(x + offset.x);
widget.setY(y + offset.y);
}
if (element instanceof Widget){
if (element instanceof Widget) {
((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
}
}

22
src/main/java/chylex/bettercontrols/gui/ScreenPatcher.java
View File

@ -14,16 +14,16 @@ import java.util.Optional;
import java.util.function.Consumer;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class ScreenPatcher{
private ScreenPatcher(){}
public final class ScreenPatcher {
private ScreenPatcher() {}
public static void onControlsScreenOpened(final ControlsScreen screen){
public static void onControlsScreenOpened(final ControlsScreen screen) {
final AccessScreenButtons accessor = (AccessScreenButtons)screen;
final List<? extends GuiEventListener> children = screen.children();
final CycleButton<?> autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
if (autoJump != null){
if (autoJump != null) {
final Button widget = new Button(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> {
MINECRAFT.setScreen(new BetterControlsScreen(screen));
});
@ -33,28 +33,28 @@ public final class ScreenPatcher{
}
}
public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen){
public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen) {
walkChildren(screen.children(), it -> {
getOptionButton(it, Option.TOGGLE_SPRINT).ifPresent(button -> button.active = false);
getOptionButton(it, Option.TOGGLE_CROUCH).ifPresent(button -> button.active = false);
});
}
private static void walkChildren(final List<? extends GuiEventListener> elements, final Consumer<GuiEventListener> callback){
for (final GuiEventListener element : elements){
private static void walkChildren(final List<? extends GuiEventListener> elements, final Consumer<GuiEventListener> callback) {
for (final GuiEventListener element : elements) {
callback.accept(element);
if (element instanceof ContainerEventHandler){
if (element instanceof ContainerEventHandler) {
walkChildren(((ContainerEventHandler)element).children(), callback);
}
}
}
private static Optional<CycleButton<?>> getOptionButton(final GuiEventListener element, final Option option){
if (element instanceof CycleButton<?> && ((AccessOptionFields)option).getCaption().equals(((AccessCycleButtonFields)element).getName())){
private static Optional<CycleButton<?>> getOptionButton(final GuiEventListener element, final Option option) {
if (element instanceof CycleButton<?> && ((AccessOptionFields)option).getCaption().equals(((AccessCycleButtonFields)element).getName())) {
return Optional.of((CycleButton<?>)element);
}
else{
else {
return Optional.empty();
}
}

8
src/main/java/chylex/bettercontrols/gui/elements/BooleanValueWidget.java
View File

@ -3,22 +3,22 @@ import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.client.gui.components.Button;
import net.minecraft.network.chat.CommonComponents;
public final class BooleanValueWidget extends Button{
public final class BooleanValueWidget extends Button {
private final BooleanConsumer onChanged;
private boolean value;
public BooleanValueWidget(final int x, final int y, final int width, final int height, final boolean currentValue, final BooleanConsumer onChanged){
public BooleanValueWidget(final int x, final int y, final int width, final int height, final boolean currentValue, final BooleanConsumer onChanged) {
super(x, y, width, height, currentValue ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, ignore -> {});
this.value = currentValue;
this.onChanged = onChanged;
}
public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged){
public BooleanValueWidget(final int x, final int y, final int width, final boolean currentValue, final BooleanConsumer onChanged) {
this(x, y, width, 20, currentValue, onChanged);
}
@Override
public void onPress(){
public void onPress() {
super.onPress();
value = !value;
setMessage(value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);

10
src/main/java/chylex/bettercontrols/gui/elements/CycleButtonWidget.java
View File

@ -3,27 +3,27 @@ import net.minecraft.client.gui.components.Button;
import java.util.List;
import java.util.function.Consumer;
public class CycleButtonWidget<T> extends Button{
public class CycleButtonWidget<T> extends Button {
private final List<Option<T>> options;
private final Consumer<T> onChanged;
private T selectedValue;
public CycleButtonWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
public CycleButtonWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
super(x, y, width, height, Option.find(options, selectedValue).getText(), btn -> {});
this.options = options;
this.selectedValue = selectedValue;
this.onChanged = onChanged;
}
public CycleButtonWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
public CycleButtonWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
this(x, y, width, 20, options, selectedValue, onChanged);
}
@Override
public void onPress(){
public void onPress() {
int nextIndex = options.indexOf(Option.find(options, selectedValue)) + 1;
if (nextIndex >= options.size()){
if (nextIndex >= options.size()) {
nextIndex = 0;
}

14
src/main/java/chylex/bettercontrols/gui/elements/DiscreteValueSliderWidget.java
View File

@ -4,36 +4,36 @@ import net.minecraft.util.Mth;
import java.util.List;
import java.util.function.Consumer;
public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton{
public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton {
private final List<Option<T>> options;
private final Consumer<T> onChanged;
private T selectedValue;
public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
public DiscreteValueSliderWidget(final int x, final int y, final int width, final int height, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
super(x, y, width, height, Option.find(options, selectedValue).getText(), options.indexOf(Option.find(options, selectedValue)) / (options.size() - 1.0));
this.options = options;
this.selectedValue = selectedValue;
this.onChanged = onChanged;
}
public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged){
public DiscreteValueSliderWidget(final int x, final int y, final int width, final List<Option<T>> options, final T selectedValue, final Consumer<T> onChanged) {
this(x, y, width, 20, options, selectedValue, onChanged);
}
public Option<T> getSelectedOption(){
public Option<T> getSelectedOption() {
return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
}
@Override
protected void updateMessage(){
protected void updateMessage() {
setMessage(getSelectedOption().getText());
}
@Override
protected void applyValue(){
protected void applyValue() {
final T newSelectedValue = getSelectedOption().getValue();
if (selectedValue != newSelectedValue){
if (selectedValue != newSelectedValue) {
selectedValue = newSelectedValue;
onChanged.accept(newSelectedValue);
}

32
src/main/java/chylex/bettercontrols/gui/elements/KeyBindingWidget.java
View File

@ -14,7 +14,7 @@ import java.util.List;
import java.util.function.Consumer;
import static chylex.bettercontrols.util.Statics.OPTIONS;
public final class KeyBindingWidget extends Button{
public final class KeyBindingWidget extends Button {
private final KeyMapping binding;
private final Component bindingName;
@ -23,7 +23,7 @@ public final class KeyBindingWidget extends Button{
private final Consumer<KeyBindingWidget> onEditingStarted;
private boolean isEditing;
public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted){
public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
super(x, y, width, height, TextComponent.EMPTY, btn -> {});
this.binding = binding;
this.bindingName = new TranslatableComponent(binding.saveString());
@ -31,60 +31,60 @@ public final class KeyBindingWidget extends Button{
updateKeyBindingText();
}
public KeyBindingWidget(final int x, final int y, final int width, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted){
public KeyBindingWidget(final int x, final int y, final int width, final KeyMapping binding, final Consumer<KeyBindingWidget> onEditingStarted) {
this(x, y, width, 20, binding, onEditingStarted);
}
public void linkButtonToBoundState(final AbstractButton button){
public void linkButtonToBoundState(final AbstractButton button) {
linkedButtons.add(button);
button.active = !Key.isUnbound(binding);
}
@Override
protected MutableComponent createNarrationMessage(){
protected MutableComponent createNarrationMessage() {
return Key.isUnbound(binding) ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
}
@Override
public void onPress(){
public void onPress() {
isEditing = true;
onEditingStarted.accept(this);
updateKeyBindingText();
}
public void bindAndStopEditing(final InputConstants.Key key){
public void bindAndStopEditing(final InputConstants.Key key) {
Key.bind(binding, key);
stopEditing();
for(final AbstractButton button : linkedButtons){
for (final AbstractButton button : linkedButtons) {
button.active = !Key.isUnbound(binding);
}
}
public void stopEditing(){
public void stopEditing() {
isEditing = false;
updateKeyBindingText();
}
public void updateKeyBindingText(){
public void updateKeyBindingText() {
boolean hasConflict = false;
if (!Key.isUnbound(binding)){
for(final KeyMapping other : OPTIONS.keyMappings){
if (binding != other && binding.equals(other)){
if (!Key.isUnbound(binding)) {
for (final KeyMapping other : OPTIONS.keyMappings) {
if (binding != other && binding.equals(other)) {
hasConflict = true;
break;
}
}
}
if (isEditing){
if (isEditing) {
setMessage((new TextComponent("> ")).append(Key.getBoundKeyText(binding).copy().withStyle(ChatFormatting.YELLOW)).append(" <").withStyle(ChatFormatting.YELLOW));
}
else if (hasConflict){
else if (hasConflict) {
setMessage(Key.getBoundKeyText(binding).copy().withStyle(ChatFormatting.RED));
}
else{
else {
setMessage(Key.isUnbound(binding) ? new TextComponent("(No Binding)") : Key.getBoundKeyText(binding));
}
}

10
src/main/java/chylex/bettercontrols/gui/elements/Option.java
View File

@ -3,24 +3,24 @@ import chylex.bettercontrols.util.LiteralText;
import java.util.List;
import java.util.Objects;
public final class Option<T>{
public final class Option<T> {
private final T value;
private final LiteralText text;
public Option(final T value, final LiteralText text){
public Option(final T value, final LiteralText text) {
this.value = value;
this.text = text;
}
public T getValue(){
public T getValue() {
return value;
}
public LiteralText getText(){
public LiteralText getText() {
return text;
}
public static <T> Option<T> find(final List<Option<T>> options, final T value){
public static <T> Option<T> find(final List<Option<T>> options, final T value) {
return options.stream().filter(it -> Objects.equals(it.value, value)).findFirst().orElseGet(() -> options.get(0));
}
}

20
src/main/java/chylex/bettercontrols/gui/elements/TextWidget.java
View File

@ -8,7 +8,7 @@ import net.minecraft.util.FormattedCharSequence;
import java.util.List;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class TextWidget extends GuiComponent implements OptionWidget{
public final class TextWidget extends GuiComponent implements OptionWidget {
public static final int LEFT = 0;
public static final int CENTER = 1;
@ -19,7 +19,7 @@ public final class TextWidget extends GuiComponent implements OptionWidget{
private final int height;
private final int align;
public TextWidget(final int x, final int y, final int width, final int height, final LiteralText text, final int align){
public TextWidget(final int x, final int y, final int width, final int height, final LiteralText text, final int align) {
this.x = x;
this.y = y;
this.width = width;
@ -28,36 +28,36 @@ public final class TextWidget extends GuiComponent implements OptionWidget{
this.align = align;
}
public TextWidget(final int x, final int y, final int width, final LiteralText text, final int align){
public TextWidget(final int x, final int y, final int width, final LiteralText text, final int align) {
this(x, y, width, 20, text, align);
}
public TextWidget(final int x, final int y, final int width, final LiteralText text){
public TextWidget(final int x, final int y, final int width, final LiteralText text) {
this(x, y, width, 20, text, LEFT);
}
@Override
public int getX(){
public int getX() {
return x;
}
@Override
public int getY(){
public int getY() {
return y;
}
@Override
public void setX(final int x){
public void setX(final int x) {
this.x = x;
}
@Override
public void setY(final int y){
public void setY(final int y) {
this.y = y;
}
@Override
public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta){
public void render(final PoseStack matrices, final int mouseX, final int mouseY, final float delta) {
final Font textRenderer = MINECRAFT.font;
final List<FormattedCharSequence> lines = textRenderer.split(text, width);
final int lineHeight = textRenderer.lineHeight + 1;
@ -65,7 +65,7 @@ public final class TextWidget extends GuiComponent implements OptionWidget{
final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::width).max().orElse(0) / 2) : x;
final int finalY = y + (height / 2) - (lineHeight * lines.size() / 2) + 1;
for(int i = 0; i < lines.size(); i++){
for (int i = 0; i < lines.size(); i++) {
final FormattedCharSequence line = lines.get(i);
textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
}

14
src/main/java/chylex/bettercontrols/input/KeyBindingWithModifier.java
View File

@ -5,36 +5,36 @@ import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TranslatableComponent;
import javax.annotation.Nullable;
public class KeyBindingWithModifier extends KeyMapping{
public class KeyBindingWithModifier extends KeyMapping {
public static final String CATEGORY = "key.categories.bettercontrols";
public static boolean checkCategoryMatches(final Component text){
public static boolean checkCategoryMatches(final Component text) {
return text instanceof TranslatableComponent && CATEGORY.equals(((TranslatableComponent)text).getKey());
}
@Nullable
private ModifierKey modifier = null;
public KeyBindingWithModifier(final String translationKey){
public KeyBindingWithModifier(final String translationKey) {
super(translationKey, Type.KEYSYM, -1, CATEGORY);
}
public void setModifier(@Nullable final ModifierKey modifier){
public void setModifier(@Nullable final ModifierKey modifier) {
this.modifier = modifier;
}
@Nullable
public ModifierKey getModifier(){
public ModifierKey getModifier() {
return modifier;
}
@Override
public boolean isDown(){
public boolean isDown() {
return super.isDown() && (modifier == null || modifier.isPressed());
}
@Override
public boolean consumeClick(){
public boolean consumeClick() {
return super.consumeClick() && (modifier == null || modifier.isPressed());
}
}

20
src/main/java/chylex/bettercontrols/input/ModifierKey.java
View File

@ -1,38 +1,38 @@
package chylex.bettercontrols.input;
import net.minecraft.client.gui.screens.Screen;
public enum ModifierKey{
CONTROL(0){
public enum ModifierKey {
CONTROL(0) {
@Override
public boolean isPressed(){
public boolean isPressed() {
return Screen.hasControlDown();
}
},
SHIFT(1){
SHIFT(1) {
@Override
public boolean isPressed(){
public boolean isPressed() {
return Screen.hasShiftDown();
}
},
ALT(2){
ALT(2) {
@Override
public boolean isPressed(){
public boolean isPressed() {
return Screen.hasAltDown();
}
};
public final int id;
ModifierKey(final int id){
ModifierKey(final int id) {
this.id = id;
}
public abstract boolean isPressed();
public static ModifierKey getById(final int id){
switch(id){
public static ModifierKey getById(final int id) {
switch (id) {
case 0: return CONTROL;
case 1: return SHIFT;
case 2: return ALT;

2
src/main/java/chylex/bettercontrols/input/SprintMode.java
View File

@ -1,6 +1,6 @@
package chylex.bettercontrols.input;
public enum SprintMode{
public enum SprintMode {
TAP_TO_START,
TAP_TO_TOGGLE,
HOLD

28
src/main/java/chylex/bettercontrols/input/ToggleTracker.java
View File

@ -2,7 +2,7 @@ package chylex.bettercontrols.input;
import chylex.bettercontrols.util.Key;
import net.minecraft.client.KeyMapping;
public class ToggleTracker{
public class ToggleTracker {
protected final KeyMapping bindingToggle;
protected final KeyMapping bindingReset;
@ -12,7 +12,7 @@ public class ToggleTracker{
private boolean hasToggledWhileHoldingReset;
private boolean skipNextToggle;
public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset){
public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset) {
this.bindingToggle = bindingToggle;
this.bindingReset = bindingReset;
}
@ -41,15 +41,15 @@ public class ToggleTracker{
* +CTRL, +G, -CTRL, +CTRL, +G, +G --> toggled on
*/
public boolean tick(){
public boolean tick() {
final boolean isHoldingReset = isResetKeyPressed();
if (Key.isPressed(bindingToggle)){
if (!waitForRelease){
if (skipNextToggle){
if (Key.isPressed(bindingToggle)) {
if (!waitForRelease) {
if (skipNextToggle) {
skipNextToggle = false;
}
else{
else {
isToggled = !isToggled;
}
@ -57,32 +57,32 @@ public class ToggleTracker{
hasToggledWhileHoldingReset = isHoldingReset;
}
}
else{
else {
waitForRelease = false;
}
if (isToggled){
if (hasToggledWhileHoldingReset && !isHoldingReset){
if (isToggled) {
if (hasToggledWhileHoldingReset && !isHoldingReset) {
hasToggledWhileHoldingReset = false;
}
else if (!hasToggledWhileHoldingReset && isHoldingReset){
else if (!hasToggledWhileHoldingReset && isHoldingReset) {
isToggled = false;
skipNextToggle = true;
}
}
if (skipNextToggle && !isHoldingReset){
if (skipNextToggle && !isHoldingReset) {
skipNextToggle = false;
}
return isToggled;
}
protected boolean isResetKeyPressed(){
protected boolean isResetKeyPressed() {
return Key.isPressed(bindingReset);
}
public void reset(){
public void reset() {
isToggled = false;
waitForRelease = false;
}

10
src/main/java/chylex/bettercontrols/input/ToggleTrackerForStickyKey.java
View File

@ -5,16 +5,16 @@ import net.minecraft.client.KeyMapping;
import java.util.HashSet;
import java.util.Set;
public final class ToggleTrackerForStickyKey extends ToggleTracker{
public final class ToggleTrackerForStickyKey extends ToggleTracker {
private static final Set<KeyMapping> enabledOverrides = new HashSet<>();
public static boolean isOverrideEnabled(final KeyMapping binding){
public static boolean isOverrideEnabled(final KeyMapping binding) {
return enabledOverrides.contains(binding);
}
private final BooleanConsumer setToggleState;
public ToggleTrackerForStickyKey(final KeyMapping bindingToggle, final KeyMapping bindingStickyReset, final BooleanConsumer setToggleState){
public ToggleTrackerForStickyKey(final KeyMapping bindingToggle, final KeyMapping bindingStickyReset, final BooleanConsumer setToggleState) {
super(bindingToggle, bindingStickyReset);
this.setToggleState = setToggleState;
this.setToggleState.accept(false);
@ -22,14 +22,14 @@ public final class ToggleTrackerForStickyKey extends ToggleTracker{
}
@Override
public boolean tick(){
public boolean tick() {
final boolean isToggled = super.tick();
setToggleState.accept(isToggled);
return isToggled;
}
@Override
protected boolean isResetKeyPressed(){
protected boolean isResetKeyPressed() {
return ((AccessKeyBindingFields)bindingReset).isPressedField();
}
}

2
src/main/java/chylex/bettercontrols/mixin/AccessCameraFields.java
View File

@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Camera.class)
public interface AccessCameraFields{
public interface AccessCameraFields {
@Accessor("eyeHeight")
void setCameraY(float y);
}

2
src/main/java/chylex/bettercontrols/mixin/AccessClientPlayerFields.java
View File

@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(LocalPlayer.class)
public interface AccessClientPlayerFields{
public interface AccessClientPlayerFields {
@Accessor("sprintTriggerTime")
void setTicksLeftToDoubleTapSprint(int value);
}

2
src/main/java/chylex/bettercontrols/mixin/AccessControlsListCategory.java
View File

@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CategoryEntry.class)
public interface AccessControlsListCategory{
public interface AccessControlsListCategory {
@Accessor("name")
Component getText();
}

2
src/main/java/chylex/bettercontrols/mixin/AccessControlsListKeyBinding.java
View File

@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(KeyEntry.class)
public interface AccessControlsListKeyBinding{
public interface AccessControlsListKeyBinding {
@Accessor("key")
KeyMapping getBinding();
}

2
src/main/java/chylex/bettercontrols/mixin/AccessCycleButtonFields.java
View File

@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CycleButton.class)
public interface AccessCycleButtonFields{
public interface AccessCycleButtonFields {
@Accessor("name")
Component getName();
}

4
src/main/java/chylex/bettercontrols/mixin/AccessKeyBindingFields.java
View File

@ -5,9 +5,9 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map;
@Mixin(KeyMapping.class)
public interface AccessKeyBindingFields{
public interface AccessKeyBindingFields {
@Accessor("CATEGORY_SORT_ORDER")
static Map<String, Integer> getCategoryOrderMap(){
static Map<String, Integer> getCategoryOrderMap() {
throw new AssertionError();
}

2
src/main/java/chylex/bettercontrols/mixin/AccessOptionFields.java
View File

@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Option.class)
public interface AccessOptionFields{
public interface AccessOptionFields {
@Accessor("caption")
Component getCaption();
}

2
src/main/java/chylex/bettercontrols/mixin/AccessPlayerFields.java
View File

@ -4,7 +4,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Player.class)
public interface AccessPlayerFields{
public interface AccessPlayerFields {
@Accessor("jumpTriggerTime")
void setTicksLeftToDoubleTapFlight(int value);
}

2
src/main/java/chylex/bettercontrols/mixin/AccessScreenButtons.java
View File

@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
@Mixin(Screen.class)
public interface AccessScreenButtons{
public interface AccessScreenButtons {
@Invoker
<T extends GuiEventListener & Widget & NarratableEntry> T callAddRenderableWidget(T widget);

2
src/main/java/chylex/bettercontrols/mixin/AccessStickyKeyBindingStateGetter.java
View File

@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.function.BooleanSupplier;
@Mixin(ToggleKeyMapping.class)
public interface AccessStickyKeyBindingStateGetter{
public interface AccessStickyKeyBindingStateGetter {
@Accessor("needsToggle")
BooleanSupplier getToggleGetter();

5
src/main/java/chylex/bettercontrols/mixin/HookClientPlayerFOV.java
View File

@ -9,8 +9,9 @@ import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Slice;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
@SuppressWarnings("MethodMayBeStatic")
@Mixin(AbstractClientPlayer.class)
public abstract class HookClientPlayerFOV{
public abstract class HookClientPlayerFOV {
@Redirect(
method = "getFieldOfViewModifier",
at = @At(value = "INVOKE", target = "Ljava/lang/Float;isNaN(F)Z"),
@ -19,7 +20,7 @@ public abstract class HookClientPlayerFOV{
to = @At(value = "INVOKE", target = "Ljava/lang/Float;isInfinite(F)Z")
)
)
private boolean resetFOV(float movementSpeed){
private boolean resetFOV(final float movementSpeed) {
final LocalPlayer player = MINECRAFT.player;
return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
}

6
src/main/java/chylex/bettercontrols/mixin/HookClientPlayerInputTick.java
View File

@ -11,13 +11,13 @@ import static chylex.bettercontrols.util.Statics.MINECRAFT;
import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
@Mixin(KeyboardInput.class)
public abstract class HookClientPlayerInputTick{
public abstract class HookClientPlayerInputTick {
@Inject(method = "tick(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/player/KeyboardInput;up:Z", ordinal = 0, shift = AFTER))
private void afterInputTick(final CallbackInfo info){
private void afterInputTick(final CallbackInfo info) {
final Input input = (Input)(Object)this;
final LocalPlayer player = MINECRAFT.player;
if (player != null){
if (player != null) {
PlayerTicker.get(player).afterInputAssignsPressingForward(input);
}
}

10
src/main/java/chylex/bettercontrols/mixin/HookClientPlayerTick.java
View File

@ -11,25 +11,25 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
@Mixin(LocalPlayer.class)
public abstract class HookClientPlayerTick extends AbstractClientPlayer{
protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile){
public abstract class HookClientPlayerTick extends AbstractClientPlayer {
protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile) {
super(world, profile);
}
@Inject(method = "aiStep()V", at = @At("HEAD"))
private void atHead(final CallbackInfo info){
private void atHead(final CallbackInfo info) {
final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).atHead(player);
}
@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/Input;tick(Z)V", ordinal = 0, shift = AFTER))
private void afterInputTick(final CallbackInfo info){
private void afterInputTick(final CallbackInfo info) {
final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).afterInputTick(player);
}
@Inject(method = "aiStep()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/AbstractClientPlayer;aiStep()V", ordinal = 0, shift = AFTER))
private void afterSuperCall(final CallbackInfo info){
private void afterSuperCall(final CallbackInfo info) {
final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).afterSuperCall(player);
}

10
src/main/java/chylex/bettercontrols/mixin/HookControlsListWidget.java
View File

@ -15,19 +15,19 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ControlList.class)
public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry>{
public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight){
public abstract class HookControlsListWidget extends ContainerObjectSelectionList<Entry> {
public HookControlsListWidget(final Minecraft client, final int width, final int height, final int top, final int bottom, final int itemHeight) {
super(client, width, height, top, bottom, itemHeight);
}
@Inject(method = "<init>", at = @At("TAIL"))
public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci){
public void init(final ControlsScreen parent, final Minecraft client, final CallbackInfo ci) {
children().removeIf(it -> {
if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())){
if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())) {
return true;
}
if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())){
if (it instanceof KeyEntry && ArrayUtils.contains(BetterControlsMod.config.getAllKeyBindings(), ((AccessControlsListKeyBinding)it).getBinding())) {
return true;
}

6
src/main/java/chylex/bettercontrols/mixin/HookLoadGameOptions.java
View File

@ -11,15 +11,15 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Options.class)
public abstract class HookLoadGameOptions{
public abstract class HookLoadGameOptions {
private boolean hasLoaded = false;
@Shadow
public KeyMapping[] keyMappings;
@Inject(method = "load()V", at = @At("HEAD"))
private void load(final CallbackInfo info){
if (hasLoaded){
private void load(final CallbackInfo info) {
if (hasLoaded) {
return;
}

11
src/main/java/chylex/bettercontrols/mixin/HookOpenScreen.java
View File

@ -10,17 +10,18 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
@SuppressWarnings("MethodMayBeStatic")
@Mixin(value = Minecraft.class, priority = 100)
public abstract class HookOpenScreen{
public abstract class HookOpenScreen {
@Inject(method = "setScreen", at = @At("TAIL"))
private void openScreen(final Screen ignore, final CallbackInfo ci){
private void openScreen(final Screen ignore, final CallbackInfo ci) {
final Screen screen = MINECRAFT.screen;
if (screen != null && !Screen.hasAltDown()){
if (screen.getClass() == ControlsScreen.class){
if (screen != null && !Screen.hasAltDown()) {
if (screen.getClass() == ControlsScreen.class) {
ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
}
else if (screen.getClass() == AccessibilityOptionsScreen.class){
else if (screen.getClass() == AccessibilityOptionsScreen.class) {
ScreenPatcher.onAccessibilityScreenOpened((AccessibilityOptionsScreen)screen);
}
}

7
src/main/java/chylex/bettercontrols/mixin/HookPlayerFlightSpeed.java
View File

@ -8,9 +8,10 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Slice;
@SuppressWarnings("MethodMayBeStatic")
@Mixin(Player.class)
public abstract class HookPlayerFlightSpeed extends LivingEntity{
protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world){
public abstract class HookPlayerFlightSpeed extends LivingEntity {
protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world) {
super(type, world);
}
@ -19,7 +20,7 @@ public abstract class HookPlayerFlightSpeed extends LivingEntity{
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z"),
slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F"))
)
private boolean disableVanillaSprintBoost(final Player player){
private boolean disableVanillaSprintBoost(final Player player) {
return false;
}
}

10
src/main/java/chylex/bettercontrols/mixin/HookStickyKeyBindingState.java
View File

@ -11,25 +11,25 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.function.BooleanSupplier;
@Mixin(ToggleKeyMapping.class)
public abstract class HookStickyKeyBindingState extends KeyMapping{
public abstract class HookStickyKeyBindingState extends KeyMapping {
@Shadow
@Final
private BooleanSupplier needsToggle;
public HookStickyKeyBindingState(final String translationKey, final int code, final String category){
public HookStickyKeyBindingState(final String translationKey, final int code, final String category) {
super(translationKey, code, category);
}
@Inject(method = "setDown", at = @At("HEAD"), cancellable = true)
public void setPressed(final boolean pressed, final CallbackInfo info){
if (ToggleTrackerForStickyKey.isOverrideEnabled(this)){
public void setPressed(final boolean pressed, final CallbackInfo info) {
if (ToggleTrackerForStickyKey.isOverrideEnabled(this)) {
((AccessKeyBindingFields)this).setPressedField(pressed);
info.cancel();
}
}
@Override
public boolean isDown(){
public boolean isDown() {
return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
}
}

42
src/main/java/chylex/bettercontrols/player/FlightHelper.java
View File

@ -3,64 +3,64 @@ import chylex.bettercontrols.BetterControlsMod;
import chylex.bettercontrols.config.BetterControlsConfig;
import net.minecraft.client.player.LocalPlayer;
final class FlightHelper{
private FlightHelper(){}
final class FlightHelper {
private FlightHelper() {}
private static final float BASE_FLIGHT_SPEED = 0.05F;
private static final float BASE_VERTICAL_VELOCITY = 3F;
private static BetterControlsConfig cfg(){
private static BetterControlsConfig cfg() {
return BetterControlsMod.config;
}
static boolean isFlyingCreativeOrSpectator(final LocalPlayer player){
static boolean isFlyingCreativeOrSpectator(final LocalPlayer player) {
return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
}
static boolean shouldFlyOnGround(final LocalPlayer player){
static boolean shouldFlyOnGround(final LocalPlayer player) {
return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
}
static float getFlightSpeed(final LocalPlayer player, final boolean boost){
if (player.isCreative()){
if (boost){
static float getFlightSpeed(final LocalPlayer player, final boolean boost) {
if (player.isCreative()) {
if (boost) {
return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
}
else{
else {
return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeDefault;
}
}
else if (player.isSpectator()){
if (boost){
else if (player.isSpectator()) {
if (boost) {
return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorSprinting;
}
else{
else {
return BASE_FLIGHT_SPEED * cfg().flightSpeedMpSpectatorDefault;
}
}
else{
else {
return 0F;
}
}
static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting){
if (player.isCreative()){
if (isSprinting){
static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting) {
if (player.isCreative()) {
if (isSprinting) {
return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;
}
else{
else {
return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeDefault;
}
}
else if (player.isSpectator()){
if (isSprinting){
else if (player.isSpectator()) {
if (isSprinting) {
return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorSprinting;
}
else{
else {
return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostSpectatorDefault;
}
}
else{
else {
return 0F;
}
}

128
src/main/java/chylex/bettercontrols/player/PlayerTicker.java
View File

@ -22,24 +22,24 @@ import static chylex.bettercontrols.util.Statics.KEY_SPRINT;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
import static chylex.bettercontrols.util.Statics.OPTIONS;
public final class PlayerTicker{
public final class PlayerTicker {
private static PlayerTicker ticker = new PlayerTicker(null);
public static PlayerTicker get(final LocalPlayer player){
if (ticker.ref.get() != player){
public static PlayerTicker get(final LocalPlayer player) {
if (ticker.ref.get() != player) {
ticker = new PlayerTicker(player);
}
return ticker;
}
private static BetterControlsConfig cfg(){
private static BetterControlsConfig cfg() {
return BetterControlsMod.config;
}
private final WeakReference<LocalPlayer> ref;
private PlayerTicker(final LocalPlayer player){
private PlayerTicker(final LocalPlayer player) {
this.ref = new WeakReference<>(player);
setup();
}
@ -62,27 +62,27 @@ public final class PlayerTicker{
private boolean holdingSneakWhileTouchingGround = false;
private int temporaryFlyOnGroundTimer = 0;
private void setup(){
private void setup() {
final AccessStickyKeyBindingStateGetter sprint = (AccessStickyKeyBindingStateGetter)KEY_SPRINT;
BooleanSupplier getter = sprint.getToggleGetter();
if (getter instanceof SprintPressGetter){
if (getter instanceof SprintPressGetter) {
getter = ((SprintPressGetter)getter).getWrapped();
}
sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
}
public void atHead(final LocalPlayer player){
if (FlightHelper.shouldFlyOnGround(player)){
public void atHead(final LocalPlayer player) {
if (FlightHelper.shouldFlyOnGround(player)) {
player.setOnGround(false);
}
if (!cfg().doubleTapForwardToSprint){
if (!cfg().doubleTapForwardToSprint) {
((AccessClientPlayerFields)player).setTicksLeftToDoubleTapSprint(0);
}
if (!cfg().doubleTapJumpToToggleFlight){
if (!cfg().doubleTapJumpToToggleFlight) {
((AccessPlayerFields)player).setTicksLeftToDoubleTapFlight(0);
}
@ -90,51 +90,51 @@ public final class PlayerTicker{
final boolean wasSprintToggled = OPTIONS.toggleSprint;
final boolean isSprintToggled = toggleSprint.tick();
if (temporarySprintTimer > 0){
if (temporarySprintTimer > 0) {
stopSprintingAfterReleasingSprintKey = false;
waitingForSprintKeyRelease = false;
final int nextTemporarySprintTimer = temporarySprintTimer - 1;
temporarySprintTimer = 0;
if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)){
if (!Key.isPressed(KEY_SPRINT) && Key.isPressed(KEY_FORWARD)) {
temporarySprintTimer = nextTemporarySprintTimer;
}
else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
stopSprintingAfterReleasingSprintKey = true;
}
}
if (isSprintToggled){
if (isSprintToggled) {
stopSprintingAfterReleasingSprintKey = false;
waitingForSprintKeyRelease = false;
}
else if (wasSprintToggled){
else if (wasSprintToggled) {
stopSprintingAfterReleasingSprintKey = true;
waitingForSprintKeyRelease = true;
}
else if (sprintMode == SprintMode.TAP_TO_TOGGLE){
if (Key.isPressed(KEY_SPRINT)){
if (!waitingForSprintKeyRelease){
else if (sprintMode == SprintMode.TAP_TO_TOGGLE) {
if (Key.isPressed(KEY_SPRINT)) {
if (!waitingForSprintKeyRelease) {
waitingForSprintKeyRelease = true;
stopSprintingAfterReleasingSprintKey = player.isSprinting();
}
}
else{
if (player.isSprinting() && !waitingForSprintKeyRelease){
else {
if (player.isSprinting() && !waitingForSprintKeyRelease) {
stopSprintingAfterReleasingSprintKey = false;
}
waitingForSprintKeyRelease = false;
}
}
else if (sprintMode == SprintMode.HOLD){
if (Key.isPressed(KEY_SPRINT)){
else if (sprintMode == SprintMode.HOLD) {
if (Key.isPressed(KEY_SPRINT)) {
stopSprintingAfterReleasingSprintKey = true;
}
}
if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)){
if (stopSprintingAfterReleasingSprintKey && !Key.isPressed(KEY_SPRINT)) {
stopSprintingAfterReleasingSprintKey = false;
waitingForSprintKeyRelease = false;
player.setSprinting(false);
@ -143,51 +143,51 @@ public final class PlayerTicker{
toggleSneak.tick();
}
public void afterInputAssignsPressingForward(final Input input){
if (MINECRAFT.screen == null){
public void afterInputAssignsPressingForward(final Input input) {
if (MINECRAFT.screen == null) {
input.up |= toggleWalkForward.tick();
}
}
public void afterInputTick(final LocalPlayer player){
public void afterInputTick(final LocalPlayer player) {
final Input input = player.input;
if (MINECRAFT.screen == null && !player.getAbilities().flying){
if (MINECRAFT.screen == null && !player.getAbilities().flying) {
input.jumping |= toggleJump.tick();
}
if (FlightHelper.isFlyingCreativeOrSpectator(player)){
if (FlightHelper.isFlyingCreativeOrSpectator(player)) {
final boolean boost = Key.isPressed(KEY_SPRINT);
final float flightSpeed = FlightHelper.getFlightSpeed(player, boost);
final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
if (flightSpeed > 0F){
if (flightSpeed > 0F) {
player.getAbilities().setFlyingSpeed(flightSpeed);
}
if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()){
if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()) {
int direction = 0;
if (input.shiftKeyDown){
if (input.shiftKeyDown) {
--direction;
}
if (input.jumping){
if (input.jumping) {
++direction;
}
if (direction != 0){
if (direction != 0) {
player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
}
}
}
if (cfg().resumeSprintingAfterHittingObstacle){
if (wasHittingObstacle != player.horizontalCollision){
if (!wasHittingObstacle){
if (cfg().resumeSprintingAfterHittingObstacle) {
if (wasHittingObstacle != player.horizontalCollision) {
if (!wasHittingObstacle) {
wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
}
else if (wasSprintingBeforeHittingObstacle){
else if (wasSprintingBeforeHittingObstacle) {
wasSprintingBeforeHittingObstacle = false;
temporarySprintTimer = 10;
}
@ -196,105 +196,105 @@ public final class PlayerTicker{
wasHittingObstacle = player.horizontalCollision;
}
}
else{
else {
wasHittingObstacle = player.horizontalCollision;
wasSprintingBeforeHittingObstacle = false;
}
}
public void afterSuperCall(final LocalPlayer player){
if (FlightHelper.shouldFlyOnGround(player)){
public void afterSuperCall(final LocalPlayer player) {
if (FlightHelper.shouldFlyOnGround(player)) {
final boolean isSneaking = player.isShiftKeyDown();
final boolean isOnGround = player.isOnGround();
if (!isSneaking){
if (!isSneaking) {
wasSneakingBeforeTouchingGround = false;
}
else if (!isOnGround){
else if (!isOnGround) {
wasSneakingBeforeTouchingGround = true;
}
if (!isOnGround){
if (!isOnGround) {
holdingSneakWhileTouchingGround = false;
}
else{
else {
boolean cancelLanding = true;
if (!wasSneakingBeforeTouchingGround){
if (isSneaking){
if (!wasSneakingBeforeTouchingGround) {
if (isSneaking) {
holdingSneakWhileTouchingGround = true;
}
else if (holdingSneakWhileTouchingGround){
else if (holdingSneakWhileTouchingGround) {
player.getAbilities().flying = false;
player.onUpdateAbilities();
cancelLanding = false;
}
}
if (cancelLanding){
if (cancelLanding) {
player.setOnGround(false);
}
}
}
else{
else {
wasSneakingBeforeTouchingGround = false;
holdingSneakWhileTouchingGround = false;
}
if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia) {
final Input input = player.input;
if (input.forwardImpulse == 0F && input.leftImpulse == 0F){
if (input.forwardImpulse == 0F && input.leftImpulse == 0F) {
player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
}
if (!input.jumping && !input.shiftKeyDown){
if (!input.jumping && !input.shiftKeyDown) {
player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
}
}
if (player.isCreative()){
if (Key.wasPressed(cfg().keyToggleFlight)){
if (player.isCreative()) {
if (Key.wasPressed(cfg().keyToggleFlight)) {
final boolean isFlying = !player.getAbilities().flying;
player.getAbilities().flying = isFlying;
player.onUpdateAbilities();
if (isFlying){
if (isFlying) {
temporaryFlyOnGroundTimer = 10;
}
}
if (temporaryFlyOnGroundTimer > 0){
if (player.isShiftKeyDown()){
if (temporaryFlyOnGroundTimer > 0) {
if (player.isShiftKeyDown()) {
temporaryFlyOnGroundTimer = 0;
}
else{
else {
--temporaryFlyOnGroundTimer;
player.setOnGround(false);
}
}
}
else{
else {
temporaryFlyOnGroundTimer = 0;
}
if (!cfg().sneakingMovesCameraSmoothly){
if (!cfg().sneakingMovesCameraSmoothly) {
final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
if (camera.getEntity() == player){
if (camera.getEntity() == player) {
((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
}
}
if (Key.wasPressed(cfg().keyResetAllToggles)){
if (Key.wasPressed(cfg().keyResetAllToggles)) {
toggleSprint.reset();
toggleSneak.reset();
toggleWalkForward.reset();
toggleJump.reset();
}
if (Key.isPressed(cfg().keyOpenMenu)){
if (Key.isPressed(cfg().keyOpenMenu)) {
MINECRAFT.setScreen(new BetterControlsScreen(null));
}
}

8
src/main/java/chylex/bettercontrols/player/SprintPressGetter.java
View File

@ -1,21 +1,21 @@
package chylex.bettercontrols.player;
import java.util.function.BooleanSupplier;
final class SprintPressGetter implements BooleanSupplier{
final class SprintPressGetter implements BooleanSupplier {
private final BooleanSupplier wrapped;
private final BooleanSupplier or;
public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or){
public SprintPressGetter(final BooleanSupplier wrapped, final BooleanSupplier or) {
this.wrapped = wrapped;
this.or = or;
}
public BooleanSupplier getWrapped(){
public BooleanSupplier getWrapped() {
return wrapped;
}
@Override
public boolean getAsBoolean(){
public boolean getAsBoolean() {
return wrapped.getAsBoolean() || or.getAsBoolean();
}
}

22
src/main/java/chylex/bettercontrols/util/Key.java
View File

@ -3,44 +3,44 @@ import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.KeyMapping;
import net.minecraft.network.chat.Component;
public final class Key{
private Key(){}
public final class Key {
private Key() {}
public static final InputConstants.Key INVALID = InputConstants.UNKNOWN;
public static boolean isUnbound(final KeyMapping binding){
public static boolean isUnbound(final KeyMapping binding) {
return binding.isUnbound();
}
public static boolean isPressed(final KeyMapping binding){
public static boolean isPressed(final KeyMapping binding) {
return binding.isDown();
}
public static boolean wasPressed(final KeyMapping binding){
public static boolean wasPressed(final KeyMapping binding) {
return binding.consumeClick();
}
public static Component getBoundKeyText(final KeyMapping binding){
public static Component getBoundKeyText(final KeyMapping binding) {
return binding.getTranslatedKeyMessage();
}
public static void bind(final KeyMapping binding, final InputConstants.Key input){
public static void bind(final KeyMapping binding, final InputConstants.Key input) {
binding.setKey(input);
}
public static String writeBinding(final KeyMapping binding){
public static String writeBinding(final KeyMapping binding) {
return binding.saveString();
}
public static void readBinding(final KeyMapping binding, final String serialized){
public static void readBinding(final KeyMapping binding, final String serialized) {
bind(binding, InputConstants.getKey(serialized));
}
public static InputConstants.Key inputFromMouse(final int button){
public static InputConstants.Key inputFromMouse(final int button) {
return InputConstants.Type.MOUSE.getOrCreate(button);
}
public static InputConstants.Key inputFromKeyboard(final int keyCode, final int scanCode){
public static InputConstants.Key inputFromKeyboard(final int keyCode, final int scanCode) {
return InputConstants.getKey(keyCode, scanCode);
}
}

6
src/main/java/chylex/bettercontrols/util/LiteralText.java
View File

@ -1,12 +1,12 @@
package chylex.bettercontrols.util;
import net.minecraft.network.chat.TextComponent;
public final class LiteralText extends TextComponent{
public static LiteralText text(final String text){
public final class LiteralText extends TextComponent {
public static LiteralText text(final String text) {
return new LiteralText(text);
}
public LiteralText(final String msg){
public LiteralText(final String msg) {
super(msg);
}
}

4
src/main/java/chylex/bettercontrols/util/Statics.java
View File

@ -3,8 +3,8 @@ import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft;
import net.minecraft.client.Options;
public final class Statics{
private Statics(){}
public final class Statics {
private Statics() {}
public static final Minecraft MINECRAFT = Minecraft.getInstance();
public static final Options OPTIONS = MINECRAFT.options;