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

Update to Minecraft 1.17.1

Browse Source
This commit is contained in:
chylex 2021-10-02 13:06:36 +02:00
parent 71a3c6ecec
commit dd6ae046b6
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
39 changed files with 391 additions and 360 deletions

16
build.gradle
View File

@ -6,23 +6,17 @@ buildscript {
} }
dependencies { dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT' classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
} }
} }
repositories {
maven {
url "https://maven.tterrag.com/"
}
}
apply plugin: 'net.minecraftforge.gradle' apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.spongepowered.mixin' apply plugin: 'org.spongepowered.mixin'
apply plugin: 'eclipse' apply plugin: 'eclipse'
def mcversion = "1.16.4" def mcversion = "1.17.1"
def forgeversion = "35.0.1" def forgeversion = "37.0.75"
def prefixName = 'displayName = ' def prefixName = 'displayName = '
def prefixVersion = 'version = ' def prefixVersion = 'version = '
@ -35,10 +29,10 @@ group = 'chylex.bettercontrols'
version = metaVersion version = metaVersion
archivesBaseName = metaName.replaceAll('\\s', '') archivesBaseName = metaName.replaceAll('\\s', '')
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' java.toolchain.languageVersion = JavaLanguageVersion.of(16)
minecraft { minecraft {
mappings channel: 'snapshot', version: '20201028-1.16.3' mappings channel: 'official', version: '1.17.1'
runs { runs {
client { client {

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

@ -2,23 +2,23 @@ package chylex.bettercontrols;
import chylex.bettercontrols.config.BetterControlsConfig; import chylex.bettercontrols.config.BetterControlsConfig;
import chylex.bettercontrols.gui.BetterControlsScreen; import chylex.bettercontrols.gui.BetterControlsScreen;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ExtensionPoint; import net.minecraftforge.fml.IExtensionPoint.DisplayTest;
import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.FMLPaths;
import net.minecraftforge.fml.network.FMLNetworkConstants; import net.minecraftforge.fmlclient.ConfigGuiHandler.ConfigGuiFactory;
import org.apache.commons.lang3.tuple.Pair; import net.minecraftforge.fmllegacy.network.FMLNetworkConstants;
@Mod("bettercontrols") @Mod("bettercontrols")
public final class BetterControlsMod{ public final class BetterControlsMod{
public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig); public static final BetterControlsConfig config = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> ClientLoader::loadConfig);
public BetterControlsMod(){ public BetterControlsMod(){
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY, () -> ClientLoader::createScreen); ModLoadingContext.get().registerExtensionPoint(ConfigGuiFactory.class, () -> new ConfigGuiFactory(ClientLoader::createScreen));
ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true)); ModLoadingContext.get().registerExtensionPoint(DisplayTest.class, () -> new DisplayTest(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
} }
private static final class ClientLoader { private static final class ClientLoader {

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

@ -12,13 +12,13 @@ import chylex.bettercontrols.input.ModifierKey;
import chylex.bettercontrols.input.SprintMode; import chylex.bettercontrols.input.SprintMode;
import chylex.bettercontrols.util.Key; import chylex.bettercontrols.util.Key;
import chylex.bettercontrols.util.LiteralText; import chylex.bettercontrols.util.LiteralText;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.DialogTexts; import net.minecraft.client.KeyMapping;
import net.minecraft.client.gui.IGuiEventListener; import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.screen.SettingsScreen; import net.minecraft.client.gui.screens.OptionsSubScreen;
import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.network.chat.CommonComponents;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.ArrayList; import java.util.ArrayList;
@ -33,7 +33,7 @@ import static chylex.bettercontrols.gui.elements.TextWidget.CENTER;
import static chylex.bettercontrols.util.LiteralText.text; import static chylex.bettercontrols.util.LiteralText.text;
import static chylex.bettercontrols.util.Statics.OPTIONS; import static chylex.bettercontrols.util.Statics.OPTIONS;
public class BetterControlsScreen extends SettingsScreen{ public class BetterControlsScreen extends OptionsSubScreen{
public static final LiteralText TITLE = text("Better Controls"); public static final LiteralText TITLE = text("Better Controls");
private static final int BOTTOM_PADDING = 3; private static final int BOTTOM_PADDING = 3;
@ -49,7 +49,7 @@ public class BetterControlsScreen extends SettingsScreen{
// Options // Options
private int generateSprintingOptions(int y, final List<IGuiEventListener> elements){ private int generateSprintingOptions(int y, final List<GuiEventListener> elements){
final BetterControlsConfig cfg = BetterControlsMod.config; final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint); generateKeyBindingWithModifierOption(y, elements, text("Toggle Sprint"), cfg.keyToggleSprint);
@ -73,7 +73,7 @@ public class BetterControlsScreen extends SettingsScreen{
return y; return y;
} }
private int generateSneakingOptions(int y, final List<IGuiEventListener> elements){ private int generateSneakingOptions(int y, final List<GuiEventListener> elements){
final BetterControlsConfig cfg = BetterControlsMod.config; final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak); generateKeyBindingWithModifierOption(y, elements, text("Toggle Sneak"), cfg.keyToggleSneak);
@ -88,7 +88,7 @@ public class BetterControlsScreen extends SettingsScreen{
} }
@SuppressWarnings({ "AutoBoxing", "AutoUnboxing" }) @SuppressWarnings({ "AutoBoxing", "AutoUnboxing" })
private int generateFlightOptions(int y, final List<IGuiEventListener> elements){ private int generateFlightOptions(int y, final List<GuiEventListener> elements){
final BetterControlsConfig cfg = BetterControlsMod.config; final BetterControlsConfig cfg = BetterControlsMod.config;
final List<Option<Float>> flightSpeedOptions = Arrays.asList( final List<Option<Float>> flightSpeedOptions = Arrays.asList(
@ -173,7 +173,7 @@ public class BetterControlsScreen extends SettingsScreen{
return y; return y;
} }
private int generateMiscellaneousOptions(int y, final List<IGuiEventListener> elements){ private int generateMiscellaneousOptions(int y, final List<GuiEventListener> elements){
final BetterControlsConfig cfg = BetterControlsMod.config; final BetterControlsConfig cfg = BetterControlsMod.config;
generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward); generateKeyBindingWithModifierOption(y, elements, text("Toggle Walk Forwards"), cfg.keyToggleWalkForward);
@ -203,7 +203,7 @@ public class BetterControlsScreen extends SettingsScreen{
new Option<>(ModifierKey.ALT, text("Alt")) new Option<>(ModifierKey.ALT, text("Alt"))
); );
private void generateKeyBindingWithModifierOption(final int y, final List<IGuiEventListener> 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 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); final KeyBindingWidget bindingButton = new KeyBindingWidget(col4(3), y, COL4_W, binding, this::startEditingKeyBinding);
bindingButton.linkButtonToBoundState(modifierButton); bindingButton.linkButtonToBoundState(modifierButton);
@ -214,7 +214,7 @@ public class BetterControlsScreen extends SettingsScreen{
allKeyBindings.add(bindingButton); allKeyBindings.add(bindingButton);
} }
private static void generateLeftSideText(final int y, final List<IGuiEventListener> 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)); elements.add(new TextWidget(col2(0), y, COL2_W - TEXT_PADDING_RIGHT, text));
} }
@ -232,7 +232,7 @@ public class BetterControlsScreen extends SettingsScreen{
public void init(){ public void init(){
allKeyBindings.clear(); allKeyBindings.clear();
final List<IGuiEventListener> elements = new ArrayList<>(); final List<GuiEventListener> elements = new ArrayList<>();
int y = 0; int y = 0;
elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER)); elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Sprinting"), CENTER));
@ -247,17 +247,17 @@ public class BetterControlsScreen extends SettingsScreen{
elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER)); elements.add(new TextWidget(0, y, ROW_WIDTH, ROW_HEIGHT, text("Miscellaneous"), CENTER));
y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP; y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
addButton(new Button(width / 2 - 99, height - 29, 200, 20, DialogTexts.GUI_DONE, btn -> minecraft.displayGuiScreen(parentScreen))); addRenderableWidget(new Button(width / 2 - 99, height - 29, 200, 20, CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)));
addListener(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING)); addWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING));
} }
@Override @Override
public void onClose(){ public void removed(){
BetterControlsMod.config.save(); BetterControlsMod.config.save();
} }
@Override @Override
public void render(final MatrixStack 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); renderBackground(matrices);
optionsWidget.render(matrices, mouseX, mouseY, delta); optionsWidget.render(matrices, mouseX, mouseY, delta);
drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255); drawCenteredString(matrices, font, title, width / 2, 8, (255 << 16) | (255 << 8) | 255);
@ -304,7 +304,7 @@ public class BetterControlsScreen extends SettingsScreen{
private void onKeyBindingEditingFinished(){ private void onKeyBindingEditingFinished(){
editingKeyBinding = null; editingKeyBinding = null;
KeyBinding.resetKeyBindingArrayAndHash(); KeyMapping.resetMapping();
for(final KeyBindingWidget widget : allKeyBindings){ for(final KeyBindingWidget widget : allKeyBindings){
widget.updateKeyBindingText(); widget.updateKeyBindingText();

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

@ -1,9 +1,11 @@
package chylex.bettercontrols.gui; package chylex.bettercontrols.gui;
import chylex.bettercontrols.gui.OptionListWidget.Entry; import chylex.bettercontrols.gui.OptionListWidget.Entry;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.IGuiEventListener; import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.IRenderable; import net.minecraft.client.gui.components.ContainerObjectSelectionList;
import net.minecraft.client.gui.widget.list.AbstractOptionList; import net.minecraft.client.gui.components.Widget;
import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.narration.NarratableEntry;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -12,7 +14,7 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static chylex.bettercontrols.util.Statics.MINECRAFT; import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class OptionListWidget extends AbstractOptionList<Entry>{ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>{
public static final int ROW_WIDTH = 408; public static final int ROW_WIDTH = 408;
public static final int ROW_PADDING = 2; public static final int ROW_PADDING = 2;
@ -27,19 +29,19 @@ public final class OptionListWidget extends AbstractOptionList<Entry>{
return (column * ROW_WIDTH) / 4; return (column * ROW_WIDTH) / 4;
} }
private static Offset getElementOffset(final IGuiEventListener element){ private static Offset getElementOffset(final GuiEventListener element){
if (element instanceof Widget){ if (element instanceof OptionWidget){
return new Offset(((Widget)element).getX(), ((Widget)element).getY()); return new Offset(((OptionWidget)element).getX(), ((OptionWidget)element).getY());
} }
else if (element instanceof net.minecraft.client.gui.widget.Widget){ else if (element instanceof AbstractWidget){
return new Offset(((net.minecraft.client.gui.widget.Widget)element).x, ((net.minecraft.client.gui.widget.Widget)element).y); return new Offset(((AbstractWidget)element).x, ((AbstractWidget)element).y);
} }
else{ else{
return new Offset(0, 0); return new Offset(0, 0);
} }
} }
public interface Widget extends IGuiEventListener, IRenderable{ public interface OptionWidget extends GuiEventListener, Widget{
int getX(); int getX();
int getY(); int getY();
void setX(int x); void setX(int x);
@ -56,7 +58,7 @@ public final class OptionListWidget extends AbstractOptionList<Entry>{
} }
} }
public OptionListWidget(final int top, final int bottom, final int width, final int height, final List<IGuiEventListener> 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); super(MINECRAFT, width, height, top, bottom, innerHeight);
addEntry(new Entry(widgets)); addEntry(new Entry(widgets));
} }
@ -76,38 +78,45 @@ public final class OptionListWidget extends AbstractOptionList<Entry>{
return (width + ROW_WIDTH) / 2 + 4; return (width + ROW_WIDTH) / 2 + 4;
} }
protected static final class Entry extends AbstractOptionList.Entry<Entry>{ protected static final class Entry extends ContainerObjectSelectionList.Entry<Entry>{
private final List<IGuiEventListener> elements; private final List<GuiEventListener> elements;
private final Map<IGuiEventListener, Offset> offsets; private final List<NarratableEntry> narratables;
private final Map<GuiEventListener, Offset> offsets;
public Entry(final List<IGuiEventListener> elements){ public Entry(final List<GuiEventListener> elements){
this.elements = new ArrayList<>(elements); this.elements = new ArrayList<>(elements);
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)); this.offsets = elements.stream().collect(Collectors.toMap(Function.identity(), OptionListWidget::getElementOffset));
} }
@Override @Override
public List<? extends IGuiEventListener> getEventListeners(){ public List<? extends GuiEventListener> children(){
return Collections.unmodifiableList(elements); return Collections.unmodifiableList(elements);
} }
@Override @Override
public void render(final MatrixStack 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){ public List<? extends NarratableEntry> narratables() {
for(final IGuiEventListener element : elements){ return Collections.unmodifiableList(narratables);
}
@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){
final Offset offset = offsets.get(element); final Offset offset = offsets.get(element);
if (element instanceof net.minecraft.client.gui.widget.Widget){ if (element instanceof AbstractWidget){
final net.minecraft.client.gui.widget.Widget button = (net.minecraft.client.gui.widget.Widget)element; final AbstractWidget button = (AbstractWidget)element;
button.x = x + offset.x; button.x = x + offset.x;
button.y = y + offset.y; button.y = y + offset.y;
} }
else if (element instanceof Widget){ else if (element instanceof OptionWidget){
final Widget widget = (Widget)element; final OptionWidget widget = (OptionWidget)element;
widget.setX(x + offset.x); widget.setX(x + offset.x);
widget.setY(y + offset.y); widget.setY(y + offset.y);
} }
if (element instanceof IRenderable){ if (element instanceof Widget){
((IRenderable)element).render(matrices, mouseX, mouseY, tickDelta); ((Widget)element).render(matrices, mouseX, mouseY, tickDelta);
} }
} }
} }

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

@ -1,14 +1,16 @@
package chylex.bettercontrols.gui; package chylex.bettercontrols.gui;
import chylex.bettercontrols.mixin.AccessCycleButtonFields;
import chylex.bettercontrols.mixin.AccessOptionFields;
import chylex.bettercontrols.mixin.AccessScreenButtons; import chylex.bettercontrols.mixin.AccessScreenButtons;
import net.minecraft.client.AbstractOption; import net.minecraft.client.Option;
import net.minecraft.client.gui.AccessibilityScreen; import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.IGuiEventListener; import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.client.gui.INestedGuiEventHandler; import net.minecraft.client.gui.components.events.ContainerEventHandler;
import net.minecraft.client.gui.screen.ControlsScreen; import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.widget.button.AbstractButton; import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.screens.controls.ControlsScreen;
import net.minecraft.client.gui.widget.button.OptionButton;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.function.Consumer; import java.util.function.Consumer;
import static chylex.bettercontrols.util.Statics.MINECRAFT; import static chylex.bettercontrols.util.Statics.MINECRAFT;
@ -17,46 +19,43 @@ public final class ScreenPatcher{
public static void onControlsScreenOpened(final ControlsScreen screen){ public static void onControlsScreenOpened(final ControlsScreen screen){
final AccessScreenButtons accessor = (AccessScreenButtons)screen; final AccessScreenButtons accessor = (AccessScreenButtons)screen;
final List<? extends GuiEventListener> children = screen.children();
final List<? extends IGuiEventListener> children = screen.getEventListeners(); final CycleButton<?> autoJump = children.stream().flatMap(it -> getOptionButton(it, Option.AUTO_JUMP).stream()).findAny().orElse(null);
final List<AbstractButton> buttons = accessor.getButtons();
final AbstractButton autoJump = buttons
.stream()
.filter(it -> it instanceof OptionButton && ((OptionButton)it).func_238517_a_() == AbstractOption.AUTO_JUMP)
.findAny()
.orElse(null);
if (autoJump != null){ if (autoJump != null){
children.remove(autoJump); final Button widget = new Button(autoJump.x, autoJump.y, autoJump.getWidth(), autoJump.getHeight(), BetterControlsScreen.TITLE.plainCopy().append("..."), btn -> {
buttons.remove(autoJump); MINECRAFT.setScreen(new BetterControlsScreen(screen));
});
accessor.callAddButton(new Button(autoJump.x, autoJump.y, autoJump.getWidth(), 20, BetterControlsScreen.TITLE.copy().appendString("..."), btn -> { accessor.callRemoveWidget(autoJump);
MINECRAFT.displayGuiScreen(new BetterControlsScreen(screen)); accessor.callAddRenderableWidget(widget);
}));
} }
} }
public static void onAccessibilityScreenOpened(final AccessibilityScreen screen){ public static void onAccessibilityScreenOpened(final AccessibilityOptionsScreen screen){
walkChildren(screen.getEventListeners(), it -> { walkChildren(screen.children(), it -> {
if (it instanceof OptionButton){ getOptionButton(it, Option.TOGGLE_SPRINT).ifPresent(button -> button.active = false);
final OptionButton button = (OptionButton)it; getOptionButton(it, Option.TOGGLE_CROUCH).ifPresent(button -> button.active = false);
final AbstractOption option = button.func_238517_a_();
if (option == AbstractOption.SPRINT || option == AbstractOption.SNEAK){
button.active = false;
}
}
}); });
} }
private static void walkChildren(final List<? extends IGuiEventListener> listeners, final Consumer<IGuiEventListener> callback){ private static void walkChildren(final List<? extends GuiEventListener> elements, final Consumer<GuiEventListener> callback){
for(final IGuiEventListener listener : listeners){ for (final GuiEventListener element : elements){
callback.accept(listener); callback.accept(element);
if (listener instanceof INestedGuiEventHandler){ if (element instanceof ContainerEventHandler){
walkChildren(((INestedGuiEventHandler)listener).getEventListeners(), callback); 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())){
return Optional.of((CycleButton<?>)element);
}
else{
return Optional.empty();
}
}
} }

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

@ -1,14 +1,14 @@
package chylex.bettercontrols.gui.elements; package chylex.bettercontrols.gui.elements;
import it.unimi.dsi.fastutil.booleans.BooleanConsumer; import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.client.gui.DialogTexts; import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.widget.button.Button; import net.minecraft.network.chat.CommonComponents;
public final class BooleanValueWidget extends Button{ public final class BooleanValueWidget extends Button{
private final BooleanConsumer onChanged; private final BooleanConsumer onChanged;
private boolean value; 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 ? DialogTexts.OPTIONS_ON : DialogTexts.OPTIONS_OFF, ignore -> {}); super(x, y, width, height, currentValue ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF, ignore -> {});
this.value = currentValue; this.value = currentValue;
this.onChanged = onChanged; this.onChanged = onChanged;
} }
@ -21,7 +21,7 @@ public final class BooleanValueWidget extends Button{
public void onPress(){ public void onPress(){
super.onPress(); super.onPress();
value = !value; value = !value;
setMessage(value ? DialogTexts.OPTIONS_ON : DialogTexts.OPTIONS_OFF); setMessage(value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF);
onChanged.accept(value); onChanged.accept(value);
} }
} }

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

@ -1,5 +1,5 @@
package chylex.bettercontrols.gui.elements; package chylex.bettercontrols.gui.elements;
import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.gui.components.Button;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;

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

@ -1,10 +1,10 @@
package chylex.bettercontrols.gui.elements; package chylex.bettercontrols.gui.elements;
import net.minecraft.client.gui.widget.AbstractSlider; import net.minecraft.client.gui.components.AbstractSliderButton;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.Mth;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
public final class DiscreteValueSliderWidget<T> extends AbstractSlider{ public final class DiscreteValueSliderWidget<T> extends AbstractSliderButton{
private final List<Option<T>> options; private final List<Option<T>> options;
private final Consumer<T> onChanged; private final Consumer<T> onChanged;
private T selectedValue; private T selectedValue;
@ -21,16 +21,16 @@ public final class DiscreteValueSliderWidget<T> extends AbstractSlider{
} }
public Option<T> getSelectedOption(){ public Option<T> getSelectedOption(){
return options.get(MathHelper.floor(MathHelper.clampedLerp(0.0, options.size() - 1.0, sliderValue))); return options.get(Mth.floor(Mth.clampedLerp(0.0, options.size() - 1.0, value)));
} }
@Override @Override
protected void func_230979_b_(){ protected void updateMessage(){
setMessage(getSelectedOption().getText()); setMessage(getSelectedOption().getText());
} }
@Override @Override
protected void func_230972_a_(){ protected void applyValue(){
final T newSelectedValue = getSelectedOption().getValue(); final T newSelectedValue = getSelectedOption().getValue();
if (selectedValue != newSelectedValue){ if (selectedValue != newSelectedValue){

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

@ -1,37 +1,37 @@
package chylex.bettercontrols.gui.elements; package chylex.bettercontrols.gui.elements;
import chylex.bettercontrols.util.Key; import chylex.bettercontrols.util.Key;
import net.minecraft.client.gui.widget.button.AbstractButton; import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.gui.widget.button.Button; import net.minecraft.ChatFormatting;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.KeyMapping;
import net.minecraft.client.util.InputMappings; import net.minecraft.client.gui.components.AbstractButton;
import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.client.gui.components.Button;
import net.minecraft.util.text.ITextComponent; import net.minecraft.network.chat.Component;
import net.minecraft.util.text.StringTextComponent; import net.minecraft.network.chat.MutableComponent;
import net.minecraft.util.text.TextFormatting; import net.minecraft.network.chat.TextComponent;
import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.network.chat.TranslatableComponent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import static chylex.bettercontrols.util.Statics.OPTIONS; import static chylex.bettercontrols.util.Statics.OPTIONS;
public final class KeyBindingWidget extends Button{ public final class KeyBindingWidget extends Button{
private final KeyBinding binding; private final KeyMapping binding;
private final ITextComponent bindingName; private final Component bindingName;
private final List<AbstractButton> linkedButtons = new ArrayList<>(1); private final List<AbstractButton> linkedButtons = new ArrayList<>(1);
private final Consumer<KeyBindingWidget> onEditingStarted; private final Consumer<KeyBindingWidget> onEditingStarted;
private boolean isEditing; private boolean isEditing;
public KeyBindingWidget(final int x, final int y, final int width, final int height, final KeyBinding 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, StringTextComponent.EMPTY, btn -> {}); super(x, y, width, height, TextComponent.EMPTY, btn -> {});
this.binding = binding; this.binding = binding;
this.bindingName = new TranslationTextComponent(binding.getTranslationKey()); this.bindingName = new TranslatableComponent(binding.saveString());
this.onEditingStarted = onEditingStarted; this.onEditingStarted = onEditingStarted;
updateKeyBindingText(); updateKeyBindingText();
} }
public KeyBindingWidget(final int x, final int y, final int width, final KeyBinding 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); this(x, y, width, 20, binding, onEditingStarted);
} }
@ -41,8 +41,8 @@ public final class KeyBindingWidget extends Button{
} }
@Override @Override
protected IFormattableTextComponent getNarrationMessage(){ protected MutableComponent createNarrationMessage(){
return Key.isUnbound(binding) ? new TranslationTextComponent("narrator.controls.unbound", bindingName) : new TranslationTextComponent("narrator.controls.bound", bindingName, super.getNarrationMessage()); return Key.isUnbound(binding) ? new TranslatableComponent("narrator.controls.unbound", bindingName) : new TranslatableComponent("narrator.controls.bound", bindingName, super.createNarrationMessage());
} }
@Override @Override
@ -52,7 +52,7 @@ public final class KeyBindingWidget extends Button{
updateKeyBindingText(); updateKeyBindingText();
} }
public void bindAndStopEditing(final InputMappings.Input key){ public void bindAndStopEditing(final InputConstants.Key key){
Key.bind(binding, key); Key.bind(binding, key);
stopEditing(); stopEditing();
@ -70,7 +70,7 @@ public final class KeyBindingWidget extends Button{
boolean hasConflict = false; boolean hasConflict = false;
if (!Key.isUnbound(binding)){ if (!Key.isUnbound(binding)){
for(final KeyBinding other : OPTIONS.keyBindings){ for(final KeyMapping other : OPTIONS.keyMappings){
if (binding != other && binding.equals(other)){ if (binding != other && binding.equals(other)){
hasConflict = true; hasConflict = true;
break; break;
@ -79,13 +79,13 @@ public final class KeyBindingWidget extends Button{
} }
if (isEditing){ if (isEditing){
setMessage((new StringTextComponent("> ")).append(Key.getBoundKeyText(binding).deepCopy().mergeStyle(TextFormatting.YELLOW)).appendString(" <").mergeStyle(TextFormatting.YELLOW)); 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).deepCopy().mergeStyle(TextFormatting.RED)); setMessage(Key.getBoundKeyText(binding).copy().withStyle(ChatFormatting.RED));
} }
else{ else{
setMessage(Key.isUnbound(binding) ? new StringTextComponent("(No Binding)") : Key.getBoundKeyText(binding)); setMessage(Key.isUnbound(binding) ? new TextComponent("(No Binding)") : Key.getBoundKeyText(binding));
} }
} }
} }

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

@ -1,14 +1,14 @@
package chylex.bettercontrols.gui.elements; package chylex.bettercontrols.gui.elements;
import chylex.bettercontrols.gui.OptionListWidget.Widget; import chylex.bettercontrols.gui.OptionListWidget.OptionWidget;
import chylex.bettercontrols.util.LiteralText; import chylex.bettercontrols.util.LiteralText;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiComponent;
import net.minecraft.util.IReorderingProcessor; import net.minecraft.util.FormattedCharSequence;
import java.util.List; import java.util.List;
import static chylex.bettercontrols.util.Statics.MINECRAFT; import static chylex.bettercontrols.util.Statics.MINECRAFT;
public final class TextWidget extends AbstractGui implements Widget{ public final class TextWidget extends GuiComponent implements OptionWidget{
public static final int LEFT = 0; public static final int LEFT = 0;
public static final int CENTER = 1; public static final int CENTER = 1;
@ -57,17 +57,17 @@ public final class TextWidget extends AbstractGui implements Widget{
} }
@Override @Override
public void render(final MatrixStack 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 FontRenderer textRenderer = MINECRAFT.fontRenderer; final Font textRenderer = MINECRAFT.font;
final List<IReorderingProcessor> lines = textRenderer.trimStringToWidth(text, width); final List<FormattedCharSequence> lines = textRenderer.split(text, width);
final int lineHeight = textRenderer.FONT_HEIGHT + 1; final int lineHeight = textRenderer.lineHeight + 1;
final int finalX = align == CENTER ? x + (width / 2) - (lines.stream().mapToInt(textRenderer::func_243245_a).max().orElse(0) / 2) : x; 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; 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 IReorderingProcessor line = lines.get(i); final FormattedCharSequence line = lines.get(i);
textRenderer.func_238407_a_(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255); textRenderer.drawShadow(matrices, line, finalX, finalY + (i * lineHeight), (255 << 16) | (255 << 8) | 255);
} }
} }
} }

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

@ -1,15 +1,15 @@
package chylex.bettercontrols.input; package chylex.bettercontrols.input;
import net.minecraft.client.settings.KeyBinding; import com.mojang.blaze3d.platform.InputConstants.Type;
import net.minecraft.client.util.InputMappings.Type; import net.minecraft.client.KeyMapping;
import net.minecraft.util.text.ITextComponent; import net.minecraft.network.chat.Component;
import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.network.chat.TranslatableComponent;
import javax.annotation.Nullable; import javax.annotation.Nullable;
public class KeyBindingWithModifier extends KeyBinding{ public class KeyBindingWithModifier extends KeyMapping{
public static final String CATEGORY = "key.categories.bettercontrols"; public static final String CATEGORY = "key.categories.bettercontrols";
public static boolean checkCategoryMatches(final ITextComponent text){ public static boolean checkCategoryMatches(final Component text){
return text instanceof TranslationTextComponent && CATEGORY.equals(((TranslationTextComponent)text).getKey()); return text instanceof TranslatableComponent && CATEGORY.equals(((TranslatableComponent)text).getKey());
} }
@Nullable @Nullable
@ -29,12 +29,12 @@ public class KeyBindingWithModifier extends KeyBinding{
} }
@Override @Override
public boolean isKeyDown(){ public boolean isDown(){
return super.isKeyDown() && (modifier == null || modifier.isPressed()); return super.isDown() && (modifier == null || modifier.isPressed());
} }
@Override @Override
public boolean isPressed(){ public boolean consumeClick(){
return super.isPressed() && (modifier == null || modifier.isPressed()); return super.consumeClick() && (modifier == null || modifier.isPressed());
} }
} }

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

@ -1,5 +1,5 @@
package chylex.bettercontrols.input; package chylex.bettercontrols.input;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screens.Screen;
public enum ModifierKey{ public enum ModifierKey{
CONTROL(0){ CONTROL(0){

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

@ -1,10 +1,10 @@
package chylex.bettercontrols.input; package chylex.bettercontrols.input;
import chylex.bettercontrols.util.Key; import chylex.bettercontrols.util.Key;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.KeyMapping;
public class ToggleTracker{ public class ToggleTracker{
protected final KeyBinding bindingToggle; protected final KeyMapping bindingToggle;
protected final KeyBinding bindingReset; protected final KeyMapping bindingReset;
protected boolean isToggled; protected boolean isToggled;
@ -12,7 +12,7 @@ public class ToggleTracker{
private boolean hasToggledWhileHoldingReset; private boolean hasToggledWhileHoldingReset;
private boolean skipNextToggle; private boolean skipNextToggle;
public ToggleTracker(final KeyBinding bindingToggle, final KeyBinding bindingReset){ public ToggleTracker(final KeyMapping bindingToggle, final KeyMapping bindingReset){
this.bindingToggle = bindingToggle; this.bindingToggle = bindingToggle;
this.bindingReset = bindingReset; this.bindingReset = bindingReset;
} }

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

@ -1,20 +1,20 @@
package chylex.bettercontrols.input; package chylex.bettercontrols.input;
import chylex.bettercontrols.mixin.AccessKeyBindingFields; import chylex.bettercontrols.mixin.AccessKeyBindingFields;
import it.unimi.dsi.fastutil.booleans.BooleanConsumer; import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.KeyMapping;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
public final class ToggleTrackerForStickyKey extends ToggleTracker{ public final class ToggleTrackerForStickyKey extends ToggleTracker{
private static final Set<KeyBinding> enabledOverrides = new HashSet<>(); private static final Set<KeyMapping> enabledOverrides = new HashSet<>();
public static boolean isOverrideEnabled(final KeyBinding binding){ public static boolean isOverrideEnabled(final KeyMapping binding){
return enabledOverrides.contains(binding); return enabledOverrides.contains(binding);
} }
private final BooleanConsumer setToggleState; private final BooleanConsumer setToggleState;
public ToggleTrackerForStickyKey(final KeyBinding bindingToggle, final KeyBinding bindingStickyReset, final BooleanConsumer setToggleState){ public ToggleTrackerForStickyKey(final KeyMapping bindingToggle, final KeyMapping bindingStickyReset, final BooleanConsumer setToggleState){
super(bindingToggle, bindingStickyReset); super(bindingToggle, bindingStickyReset);
this.setToggleState = setToggleState; this.setToggleState = setToggleState;
this.setToggleState.accept(false); this.setToggleState.accept(false);

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

@ -1,14 +1,10 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.Camera;
import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ActiveRenderInfo.class) @Mixin(Camera.class)
public interface AccessCameraFields{ public interface AccessCameraFields{
@Accessor("renderViewEntity") @Accessor("eyeHeight")
Entity getFocusedEntity();
@Accessor("height")
void setCameraY(float y); void setCameraY(float y);
} }

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

@ -1,10 +1,10 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ClientPlayerEntity.class) @Mixin(LocalPlayer.class)
public interface AccessClientPlayerFields{ public interface AccessClientPlayerFields{
@Accessor("sprintToggleTimer") @Accessor("sprintTriggerTime")
void setTicksLeftToDoubleTapSprint(int value); void setTicksLeftToDoubleTapSprint(int value);
} }

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

@ -1,11 +1,11 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.widget.list.KeyBindingList.CategoryEntry; import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
import net.minecraft.util.text.ITextComponent; import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CategoryEntry.class) @Mixin(CategoryEntry.class)
public interface AccessControlsListCategory{ public interface AccessControlsListCategory{
@Accessor("labelText") @Accessor("name")
ITextComponent getText(); Component getText();
} }

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

@ -1,11 +1,11 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.widget.list.KeyBindingList.KeyEntry; import net.minecraft.client.KeyMapping;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(KeyEntry.class) @Mixin(KeyEntry.class)
public interface AccessControlsListKeyBinding{ public interface AccessControlsListKeyBinding{
@Accessor("keybinding") @Accessor("key")
KeyBinding getBinding(); KeyMapping getBinding();
} }

12
src/main/java/chylex/bettercontrols/mixin/AccessCycleButtonFields.java Normal file
View File

@ -0,0 +1,12 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.components.CycleButton;
import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(CycleButton.class)
public interface AccessCycleButtonFields{
@Accessor("name")
Component getName();
}

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

@ -1,10 +0,0 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.renderer.GameRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(GameRenderer.class)
public interface AccessGameRendererFields{
@Accessor("fovModifierHand")
void setMovementFovMultiplier(float value);
}

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

@ -1,19 +1,19 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.KeyMapping;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map; import java.util.Map;
@Mixin(KeyBinding.class) @Mixin(KeyMapping.class)
public interface AccessKeyBindingFields{ public interface AccessKeyBindingFields{
@Accessor("CATEGORY_ORDER") @Accessor("CATEGORY_SORT_ORDER")
static Map<String, Integer> getCategoryOrderMap(){ static Map<String, Integer> getCategoryOrderMap(){
throw new AssertionError(); throw new AssertionError();
} }
@Accessor("pressed") @Accessor("isDown")
boolean isPressedField(); boolean isPressedField();
@Accessor("pressed") @Accessor("isDown")
void setPressedField(boolean value); void setPressedField(boolean value);
} }

12
src/main/java/chylex/bettercontrols/mixin/AccessOptionFields.java Normal file
View File

@ -0,0 +1,12 @@
package chylex.bettercontrols.mixin;
import net.minecraft.client.Option;
import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Option.class)
public interface AccessOptionFields{
@Accessor("caption")
Component getCaption();
}

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

@ -1,10 +1,10 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.entity.player.Player;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(PlayerEntity.class) @Mixin(Player.class)
public interface AccessPlayerFields{ public interface AccessPlayerFields{
@Accessor("flyToggleTimer") @Accessor("jumpTriggerTime")
void setTicksLeftToDoubleTapFlight(int value); void setTicksLeftToDoubleTapFlight(int value);
} }

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

@ -1,17 +1,16 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.components.Widget;
import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.gui.components.events.GuiEventListener;
import net.minecraft.client.gui.widget.button.AbstractButton; import net.minecraft.client.gui.narration.NarratableEntry;
import net.minecraft.client.gui.screens.Screen;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.gen.Invoker;
import java.util.List;
@Mixin(Screen.class) @Mixin(Screen.class)
public interface AccessScreenButtons{ public interface AccessScreenButtons{
@Accessor @Invoker
List<AbstractButton> getButtons(); <T extends GuiEventListener & Widget & NarratableEntry> T callAddRenderableWidget(T widget);
@Invoker @Invoker
<T extends Widget> T callAddButton(T button); void callRemoveWidget(GuiEventListener widget);
} }

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

@ -1,16 +1,16 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.client.settings.ToggleableKeyBinding; import net.minecraft.client.ToggleKeyMapping;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
@Mixin(ToggleableKeyBinding.class) @Mixin(ToggleKeyMapping.class)
public interface AccessStickyKeyBindingStateGetter{ public interface AccessStickyKeyBindingStateGetter{
@Accessor("getterToggle") @Accessor("needsToggle")
BooleanSupplier getToggleGetter(); BooleanSupplier getToggleGetter();
@Accessor("getterToggle") @Accessor("needsToggle")
@Mutable @Mutable
void setToggleGetter(final BooleanSupplier toggleGetter); void setToggleGetter(final BooleanSupplier toggleGetter);
} }

26
src/main/java/chylex/bettercontrols/mixin/HookClientPlayerFOV.java Normal file
View File

@ -0,0 +1,26 @@
package chylex.bettercontrols.mixin;
import chylex.bettercontrols.player.PlayerTicker;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Slice;
import static chylex.bettercontrols.util.Statics.MINECRAFT;
@Mixin(AbstractClientPlayer.class)
public abstract class HookClientPlayerFOV{
@Redirect(
method = "getFieldOfViewModifier",
at = @At(value = "INVOKE", target = "Ljava/lang/Float;isNaN(F)Z"),
slice = @Slice(
from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getWalkingSpeed()F"),
to = @At(value = "INVOKE", target = "Ljava/lang/Float;isInfinite(F)Z")
)
)
private boolean resetFOV(float movementSpeed){
final LocalPlayer player = MINECRAFT.player;
return (player != null && PlayerTicker.get(player).shouldResetFOV(player)) || Float.isNaN(movementSpeed);
}
}

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

@ -1,8 +1,8 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import chylex.bettercontrols.player.PlayerTicker; import chylex.bettercontrols.player.PlayerTicker;
import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.player.Input;
import net.minecraft.util.MovementInput; import net.minecraft.client.player.KeyboardInput;
import net.minecraft.util.MovementInputFromOptions; import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@ -10,12 +10,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static chylex.bettercontrols.util.Statics.MINECRAFT; import static chylex.bettercontrols.util.Statics.MINECRAFT;
import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER; import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
@Mixin(MovementInputFromOptions.class) @Mixin(KeyboardInput.class)
public abstract class HookClientPlayerInputTick{ public abstract class HookClientPlayerInputTick{
@Inject(method = "tickMovement(Z)V", at = @At(value = "FIELD", target = "Lnet/minecraft/util/MovementInputFromOptions;forwardKeyDown:Z", ordinal = 0, shift = AFTER)) @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 MovementInput input = (MovementInput)(Object)this; final Input input = (Input)(Object)this;
final ClientPlayerEntity player = MINECRAFT.player; final LocalPlayer player = MINECRAFT.player;
if (player != null){ if (player != null){
PlayerTicker.get(player).afterInputAssignsPressingForward(input); PlayerTicker.get(player).afterInputAssignsPressingForward(input);

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

@ -1,36 +1,36 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import chylex.bettercontrols.player.PlayerTicker; import chylex.bettercontrols.player.PlayerTicker;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.world.ClientWorld; import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER; import static org.spongepowered.asm.mixin.injection.At.Shift.AFTER;
@Mixin(ClientPlayerEntity.class) @Mixin(LocalPlayer.class)
public abstract class HookClientPlayerTick extends AbstractClientPlayerEntity{ public abstract class HookClientPlayerTick extends AbstractClientPlayer{
protected HookClientPlayerTick(final ClientWorld world, final GameProfile profile){ protected HookClientPlayerTick(final ClientLevel world, final GameProfile profile){
super(world, profile); super(world, profile);
} }
@Inject(method = "livingTick", at = @At("HEAD")) @Inject(method = "aiStep()V", at = @At("HEAD"))
private void atHead(final CallbackInfo info){ private void atHead(final CallbackInfo info){
final ClientPlayerEntity player = (ClientPlayerEntity)(Object)this; final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).atHead(player); PlayerTicker.get(player).atHead(player);
} }
@Inject(method = "livingTick()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/MovementInput;tickMovement(Z)V", ordinal = 0, shift = AFTER)) @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 ClientPlayerEntity player = (ClientPlayerEntity)(Object)this; final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).afterInputTick(player); PlayerTicker.get(player).afterInputTick(player);
} }
@Inject(method = "livingTick()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/player/AbstractClientPlayerEntity;livingTick()V", ordinal = 0, shift = AFTER)) @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 ClientPlayerEntity player = (ClientPlayerEntity)(Object)this; final LocalPlayer player = (LocalPlayer)(Object)this;
PlayerTicker.get(player).afterSuperCall(player); PlayerTicker.get(player).afterSuperCall(player);
} }
} }

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

@ -2,27 +2,27 @@ package chylex.bettercontrols.mixin;
import chylex.bettercontrols.BetterControlsMod; import chylex.bettercontrols.BetterControlsMod;
import chylex.bettercontrols.input.KeyBindingWithModifier; import chylex.bettercontrols.input.KeyBindingWithModifier;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.ControlsScreen; import net.minecraft.client.gui.components.ContainerObjectSelectionList;
import net.minecraft.client.gui.widget.list.AbstractOptionList; import net.minecraft.client.gui.screens.controls.ControlList;
import net.minecraft.client.gui.widget.list.KeyBindingList; import net.minecraft.client.gui.screens.controls.ControlList.CategoryEntry;
import net.minecraft.client.gui.widget.list.KeyBindingList.CategoryEntry; import net.minecraft.client.gui.screens.controls.ControlList.Entry;
import net.minecraft.client.gui.widget.list.KeyBindingList.Entry; import net.minecraft.client.gui.screens.controls.ControlList.KeyEntry;
import net.minecraft.client.gui.widget.list.KeyBindingList.KeyEntry; import net.minecraft.client.gui.screens.controls.ControlsScreen;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(KeyBindingList.class) @Mixin(ControlList.class)
public abstract class HookControlsListWidget extends AbstractOptionList<Entry>{ 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 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); super(client, width, height, top, bottom, itemHeight);
} }
@Inject(method = "<init>", at = @At("TAIL")) @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){
getEventListeners().removeIf(it -> { children().removeIf(it -> {
if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())){ if (it instanceof CategoryEntry && KeyBindingWithModifier.checkCategoryMatches(((AccessControlsListCategory)it).getText())){
return true; return true;
} }

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

@ -1,8 +1,8 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import chylex.bettercontrols.BetterControlsMod; import chylex.bettercontrols.BetterControlsMod;
import chylex.bettercontrols.input.KeyBindingWithModifier; import chylex.bettercontrols.input.KeyBindingWithModifier;
import net.minecraft.client.GameSettings; import net.minecraft.client.KeyMapping;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.Options;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -10,21 +10,21 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(GameSettings.class) @Mixin(Options.class)
public abstract class HookLoadGameOptions{ public abstract class HookLoadGameOptions{
private boolean hasLoaded = false; private boolean hasLoaded = false;
@Shadow @Shadow
public KeyBinding[] keyBindings; public KeyMapping[] keyMappings;
@Inject(method = "loadOptions()V", at = @At("HEAD")) @Inject(method = "load()V", at = @At("HEAD"))
private void load(final CallbackInfo info){ private void load(final CallbackInfo info){
if (hasLoaded){ if (hasLoaded){
return; return;
} }
hasLoaded = true; hasLoaded = true;
keyBindings = ArrayUtils.addAll(keyBindings, BetterControlsMod.config.getAllKeyBindings()); keyMappings = ArrayUtils.addAll(keyMappings, BetterControlsMod.config.getAllKeyBindings());
AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE)); AccessKeyBindingFields.getCategoryOrderMap().put(KeyBindingWithModifier.CATEGORY, Integer.valueOf(Integer.MAX_VALUE));
} }
} }

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

@ -1,9 +1,9 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import chylex.bettercontrols.gui.ScreenPatcher; import chylex.bettercontrols.gui.ScreenPatcher;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.AccessibilityScreen; import net.minecraft.client.gui.screens.AccessibilityOptionsScreen;
import net.minecraft.client.gui.screen.ControlsScreen; import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screens.controls.ControlsScreen;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@ -12,16 +12,16 @@ import static chylex.bettercontrols.util.Statics.MINECRAFT;
@Mixin(value = Minecraft.class, priority = 100) @Mixin(value = Minecraft.class, priority = 100)
public abstract class HookOpenScreen{ public abstract class HookOpenScreen{
@Inject(method = "displayGuiScreen(Lnet/minecraft/client/gui/screen/Screen;)V", at = @At("TAIL")) @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.currentScreen; final Screen screen = MINECRAFT.screen;
if (screen != null && !Screen.hasAltDown()){ if (screen != null && !Screen.hasAltDown()){
if (screen.getClass() == ControlsScreen.class){ if (screen.getClass() == ControlsScreen.class){
ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen); ScreenPatcher.onControlsScreenOpened((ControlsScreen)screen);
} }
else if (screen.getClass() == AccessibilityScreen.class){ else if (screen.getClass() == AccessibilityOptionsScreen.class){
ScreenPatcher.onAccessibilityScreenOpened((AccessibilityScreen)screen); ScreenPatcher.onAccessibilityScreenOpened((AccessibilityOptionsScreen)screen);
} }
} }
} }

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

@ -1,25 +1,25 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import net.minecraft.entity.EntityType; import net.minecraft.world.entity.EntityType;
import net.minecraft.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.World; import net.minecraft.world.level.Level;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.Slice; import org.spongepowered.asm.mixin.injection.Slice;
@Mixin(PlayerEntity.class) @Mixin(Player.class)
public abstract class HookPlayerFlightSpeed extends LivingEntity{ public abstract class HookPlayerFlightSpeed extends LivingEntity{
protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final World world){ protected HookPlayerFlightSpeed(final EntityType<? extends LivingEntity> type, final Level world){
super(type, world); super(type, world);
} }
@Redirect( @Redirect(
method = "travel", method = "travel",
at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;isSprinting()Z"), at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;isSprinting()Z"),
slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerAbilities;getFlySpeed()F")) slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Abilities;getFlyingSpeed()F"))
) )
private boolean disableVanillaSprintBoost(final PlayerEntity player){ private boolean disableVanillaSprintBoost(final Player player){
return false; return false;
} }
} }

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

@ -1,7 +1,7 @@
package chylex.bettercontrols.mixin; package chylex.bettercontrols.mixin;
import chylex.bettercontrols.input.ToggleTrackerForStickyKey; import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.KeyMapping;
import net.minecraft.client.settings.ToggleableKeyBinding; import net.minecraft.client.ToggleKeyMapping;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -10,17 +10,17 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
@Mixin(ToggleableKeyBinding.class) @Mixin(ToggleKeyMapping.class)
public abstract class HookStickyKeyBindingState extends KeyBinding{ public abstract class HookStickyKeyBindingState extends KeyMapping{
@Shadow @Shadow
@Final @Final
private BooleanSupplier getterToggle; 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); super(translationKey, code, category);
} }
@Inject(method = "setPressed(Z)V", at = @At("HEAD"), cancellable = true) @Inject(method = "setDown", at = @At("HEAD"), cancellable = true)
public void setPressed(final boolean pressed, final CallbackInfo info){ public void setPressed(final boolean pressed, final CallbackInfo info){
if (ToggleTrackerForStickyKey.isOverrideEnabled(this)){ if (ToggleTrackerForStickyKey.isOverrideEnabled(this)){
((AccessKeyBindingFields)this).setPressedField(pressed); ((AccessKeyBindingFields)this).setPressedField(pressed);
@ -29,7 +29,7 @@ public abstract class HookStickyKeyBindingState extends KeyBinding{
} }
@Override @Override
public boolean isKeyDown(){ public boolean isDown(){
return super.isKeyDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && getterToggle.getAsBoolean()); return super.isDown() || (ToggleTrackerForStickyKey.isOverrideEnabled(this) && needsToggle.getAsBoolean());
} }
} }

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

@ -1,7 +1,7 @@
package chylex.bettercontrols.player; package chylex.bettercontrols.player;
import chylex.bettercontrols.BetterControlsMod; import chylex.bettercontrols.BetterControlsMod;
import chylex.bettercontrols.config.BetterControlsConfig; import chylex.bettercontrols.config.BetterControlsConfig;
import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.player.LocalPlayer;
final class FlightHelper{ final class FlightHelper{
private FlightHelper(){} private FlightHelper(){}
@ -13,15 +13,15 @@ final class FlightHelper{
return BetterControlsMod.config; return BetterControlsMod.config;
} }
static boolean isFlyingCreativeOrSpectator(final ClientPlayerEntity player){ static boolean isFlyingCreativeOrSpectator(final LocalPlayer player){
return player.abilities.isFlying && (player.isCreative() || player.isSpectator()); return player.getAbilities().flying && (player.isCreative() || player.isSpectator());
} }
static boolean shouldFlyOnGround(final ClientPlayerEntity player){ static boolean shouldFlyOnGround(final LocalPlayer player){
return cfg().flyOnGroundInCreative && player.isCreative() && player.abilities.isFlying; return cfg().flyOnGroundInCreative && player.isCreative() && player.getAbilities().flying;
} }
static float getFlightSpeed(final ClientPlayerEntity player, final boolean boost){ static float getFlightSpeed(final LocalPlayer player, final boolean boost){
if (player.isCreative()){ if (player.isCreative()){
if (boost){ if (boost){
return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting; return BASE_FLIGHT_SPEED * cfg().flightSpeedMpCreativeSprinting;
@ -43,7 +43,7 @@ final class FlightHelper{
} }
} }
static float getExtraVerticalVelocity(final ClientPlayerEntity player, final boolean isSprinting){ static float getExtraVerticalVelocity(final LocalPlayer player, final boolean isSprinting){
if (player.isCreative()){ if (player.isCreative()){
if (isSprinting){ if (isSprinting){
return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting; return BASE_VERTICAL_VELOCITY * cfg().flightVerticalBoostCreativeSprinting;

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

@ -7,12 +7,12 @@ import chylex.bettercontrols.input.ToggleTracker;
import chylex.bettercontrols.input.ToggleTrackerForStickyKey; import chylex.bettercontrols.input.ToggleTrackerForStickyKey;
import chylex.bettercontrols.mixin.AccessCameraFields; import chylex.bettercontrols.mixin.AccessCameraFields;
import chylex.bettercontrols.mixin.AccessClientPlayerFields; import chylex.bettercontrols.mixin.AccessClientPlayerFields;
import chylex.bettercontrols.mixin.AccessGameRendererFields;
import chylex.bettercontrols.mixin.AccessPlayerFields; import chylex.bettercontrols.mixin.AccessPlayerFields;
import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter; import chylex.bettercontrols.mixin.AccessStickyKeyBindingStateGetter;
import chylex.bettercontrols.util.Key; import chylex.bettercontrols.util.Key;
import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.client.Camera;
import net.minecraft.util.MovementInput; import net.minecraft.client.player.Input;
import net.minecraft.client.player.LocalPlayer;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
import static chylex.bettercontrols.util.Statics.KEY_FORWARD; import static chylex.bettercontrols.util.Statics.KEY_FORWARD;
@ -25,7 +25,7 @@ import static chylex.bettercontrols.util.Statics.OPTIONS;
public final class PlayerTicker{ public final class PlayerTicker{
private static PlayerTicker ticker = new PlayerTicker(null); private static PlayerTicker ticker = new PlayerTicker(null);
public static PlayerTicker get(final ClientPlayerEntity player){ public static PlayerTicker get(final LocalPlayer player){
if (ticker.ref.get() != player){ if (ticker.ref.get() != player){
ticker = new PlayerTicker(player); ticker = new PlayerTicker(player);
} }
@ -37,9 +37,9 @@ public final class PlayerTicker{
return BetterControlsMod.config; return BetterControlsMod.config;
} }
private final WeakReference<ClientPlayerEntity> ref; private final WeakReference<LocalPlayer> ref;
private PlayerTicker(final ClientPlayerEntity player){ private PlayerTicker(final LocalPlayer player){
this.ref = new WeakReference<>(player); this.ref = new WeakReference<>(player);
setup(); setup();
} }
@ -73,7 +73,7 @@ public final class PlayerTicker{
sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0)); sprint.setToggleGetter(new SprintPressGetter(getter, () -> temporarySprintTimer > 0));
} }
public void atHead(final ClientPlayerEntity player){ public void atHead(final LocalPlayer player){
if (FlightHelper.shouldFlyOnGround(player)){ if (FlightHelper.shouldFlyOnGround(player)){
player.setOnGround(false); player.setOnGround(false);
} }
@ -143,17 +143,17 @@ public final class PlayerTicker{
toggleSneak.tick(); toggleSneak.tick();
} }
public void afterInputAssignsPressingForward(final MovementInput input){ public void afterInputAssignsPressingForward(final Input input){
if (MINECRAFT.currentScreen == null){ if (MINECRAFT.screen == null){
input.forwardKeyDown |= toggleWalkForward.tick(); input.up |= toggleWalkForward.tick();
} }
} }
public void afterInputTick(final ClientPlayerEntity player){ public void afterInputTick(final LocalPlayer player){
final MovementInput input = player.movementInput; final Input input = player.input;
if (MINECRAFT.currentScreen == null && !player.abilities.isFlying){ if (MINECRAFT.screen == null && !player.getAbilities().flying){
input.jump |= toggleJump.tick(); input.jumping |= toggleJump.tick();
} }
if (FlightHelper.isFlyingCreativeOrSpectator(player)){ if (FlightHelper.isFlyingCreativeOrSpectator(player)){
@ -162,28 +162,28 @@ public final class PlayerTicker{
final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost); final float verticalVelocity = FlightHelper.getExtraVerticalVelocity(player, boost);
if (flightSpeed > 0F){ if (flightSpeed > 0F){
player.abilities.setFlySpeed(flightSpeed); player.getAbilities().setFlyingSpeed(flightSpeed);
} }
if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getRenderViewEntity()){ if (Math.abs(verticalVelocity) > 1E-5F && player == MINECRAFT.getCameraEntity()){
int direction = 0; int direction = 0;
if (input.sneaking){ if (input.shiftKeyDown){
--direction; --direction;
} }
if (input.jump){ if (input.jumping){
++direction; ++direction;
} }
if (direction != 0){ if (direction != 0){
player.setMotion(player.getMotion().add(0D, flightSpeed * verticalVelocity * direction, 0D)); player.setDeltaMovement(player.getDeltaMovement().add(0D, flightSpeed * verticalVelocity * direction, 0D));
} }
} }
} }
if (cfg().resumeSprintingAfterHittingObstacle){ if (cfg().resumeSprintingAfterHittingObstacle){
if (wasHittingObstacle != player.collidedHorizontally){ if (wasHittingObstacle != player.horizontalCollision){
if (!wasHittingObstacle){ if (!wasHittingObstacle){
wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT); wasSprintingBeforeHittingObstacle = player.isSprinting() || Key.isPressed(KEY_SPRINT);
} }
@ -193,22 +193,18 @@ public final class PlayerTicker{
} }
// collision also stops when the player lets go of movement keys // collision also stops when the player lets go of movement keys
wasHittingObstacle = player.collidedHorizontally; wasHittingObstacle = player.horizontalCollision;
} }
} }
else{ else{
wasHittingObstacle = player.collidedHorizontally; wasHittingObstacle = player.horizontalCollision;
wasSprintingBeforeHittingObstacle = false; wasSprintingBeforeHittingObstacle = false;
} }
if (cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player)){
((AccessGameRendererFields)MINECRAFT.gameRenderer).setMovementFovMultiplier(1F);
}
} }
public void afterSuperCall(final ClientPlayerEntity player){ public void afterSuperCall(final LocalPlayer player){
if (FlightHelper.shouldFlyOnGround(player)){ if (FlightHelper.shouldFlyOnGround(player)){
final boolean isSneaking = player.isSneaking(); final boolean isSneaking = player.isShiftKeyDown();
final boolean isOnGround = player.isOnGround(); final boolean isOnGround = player.isOnGround();
if (!isSneaking){ if (!isSneaking){
@ -229,8 +225,8 @@ public final class PlayerTicker{
holdingSneakWhileTouchingGround = true; holdingSneakWhileTouchingGround = true;
} }
else if (holdingSneakWhileTouchingGround){ else if (holdingSneakWhileTouchingGround){
player.abilities.isFlying = false; player.getAbilities().flying = false;
player.sendPlayerAbilities(); player.onUpdateAbilities();
cancelLanding = false; cancelLanding = false;
} }
} }
@ -246,23 +242,23 @@ public final class PlayerTicker{
} }
if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){ if (FlightHelper.isFlyingCreativeOrSpectator(player) && cfg().disableFlightInertia){
final MovementInput input = player.movementInput; final Input input = player.input;
if (input.moveForward == 0F && input.moveStrafe == 0F){ if (input.forwardImpulse == 0F && input.leftImpulse == 0F){
player.setMotion(player.getMotion().mul(0.0, 1.0, 0.0)); player.setDeltaMovement(player.getDeltaMovement().multiply(0.0, 1.0, 0.0));
} }
if (!input.jump && !input.sneaking){ if (!input.jumping && !input.shiftKeyDown){
player.setMotion(player.getMotion().mul(1.0, 0.0, 1.0)); player.setDeltaMovement(player.getDeltaMovement().multiply(1.0, 0.0, 1.0));
} }
} }
if (player.isCreative()){ if (player.isCreative()){
if (Key.wasPressed(cfg().keyToggleFlight)){ if (Key.wasPressed(cfg().keyToggleFlight)){
final boolean isFlying = !player.abilities.isFlying; final boolean isFlying = !player.getAbilities().flying;
player.abilities.isFlying = isFlying; player.getAbilities().flying = isFlying;
player.sendPlayerAbilities(); player.onUpdateAbilities();
if (isFlying){ if (isFlying){
temporaryFlyOnGroundTimer = 10; temporaryFlyOnGroundTimer = 10;
@ -270,7 +266,7 @@ public final class PlayerTicker{
} }
if (temporaryFlyOnGroundTimer > 0){ if (temporaryFlyOnGroundTimer > 0){
if (player.isSneaking()){ if (player.isShiftKeyDown()){
temporaryFlyOnGroundTimer = 0; temporaryFlyOnGroundTimer = 0;
} }
else{ else{
@ -284,10 +280,10 @@ public final class PlayerTicker{
} }
if (!cfg().sneakingMovesCameraSmoothly){ if (!cfg().sneakingMovesCameraSmoothly){
final AccessCameraFields camera = (AccessCameraFields)MINECRAFT.gameRenderer.getActiveRenderInfo(); final Camera camera = MINECRAFT.gameRenderer.getMainCamera();
if (camera.getFocusedEntity() == player){ if (camera.getEntity() == player){
camera.setCameraY(player.getEyeHeight()); ((AccessCameraFields)camera).setCameraY(player.getEyeHeight());
} }
} }
@ -299,7 +295,11 @@ public final class PlayerTicker{
} }
if (Key.isPressed(cfg().keyOpenMenu)){ if (Key.isPressed(cfg().keyOpenMenu)){
MINECRAFT.displayGuiScreen(new BetterControlsScreen(null)); MINECRAFT.setScreen(new BetterControlsScreen(null));
} }
} }
public boolean shouldResetFOV(final LocalPlayer player) {
return cfg().disableChangingFovWhileFlying && FlightHelper.isFlyingCreativeOrSpectator(player);
}
} }

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

@ -1,47 +1,46 @@
package chylex.bettercontrols.util; package chylex.bettercontrols.util;
import net.minecraft.client.settings.KeyBinding; import com.mojang.blaze3d.platform.InputConstants;
import net.minecraft.client.util.InputMappings; import net.minecraft.client.KeyMapping;
import net.minecraft.client.util.InputMappings.Input; import net.minecraft.network.chat.Component;
import net.minecraft.util.text.ITextComponent;
public final class Key{ public final class Key{
private Key(){} private Key(){}
public static final Input INVALID = InputMappings.INPUT_INVALID; public static final InputConstants.Key INVALID = InputConstants.UNKNOWN;
public static boolean isUnbound(final KeyBinding binding){ public static boolean isUnbound(final KeyMapping binding){
return binding.isInvalid(); return binding.isUnbound();
} }
public static boolean isPressed(final KeyBinding binding){ public static boolean isPressed(final KeyMapping binding){
return binding.isKeyDown(); return binding.isDown();
} }
public static boolean wasPressed(final KeyBinding binding){ public static boolean wasPressed(final KeyMapping binding){
return binding.isPressed(); return binding.consumeClick();
} }
public static ITextComponent getBoundKeyText(final KeyBinding binding){ public static Component getBoundKeyText(final KeyMapping binding){
return binding.func_238171_j_(); return binding.getTranslatedKeyMessage();
} }
public static void bind(final KeyBinding binding, final Input input){ public static void bind(final KeyMapping binding, final InputConstants.Key input){
binding.bind(input); binding.setKey(input);
} }
public static String writeBinding(final KeyBinding binding){ public static String writeBinding(final KeyMapping binding){
return binding.getTranslationKey(); return binding.saveString();
} }
public static void readBinding(final KeyBinding binding, final String serialized){ public static void readBinding(final KeyMapping binding, final String serialized){
bind(binding, InputMappings.getInputByName(serialized)); bind(binding, InputConstants.getKey(serialized));
} }
public static Input inputFromMouse(final int button){ public static InputConstants.Key inputFromMouse(final int button){
return InputMappings.Type.MOUSE.getOrMakeInput(button); return InputConstants.Type.MOUSE.getOrCreate(button);
} }
public static Input inputFromKeyboard(final int keyCode, final int scanCode){ public static InputConstants.Key inputFromKeyboard(final int keyCode, final int scanCode){
return InputMappings.getInputByCode(keyCode, scanCode); return InputConstants.getKey(keyCode, scanCode);
} }
} }

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

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

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

@ -1,16 +1,16 @@
package chylex.bettercontrols.util; package chylex.bettercontrols.util;
import net.minecraft.client.GameSettings; import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.Options;
public final class Statics{ public final class Statics{
private Statics(){} private Statics(){}
public static final Minecraft MINECRAFT = Minecraft.getInstance(); public static final Minecraft MINECRAFT = Minecraft.getInstance();
public static final GameSettings OPTIONS = MINECRAFT.gameSettings; public static final Options OPTIONS = MINECRAFT.options;
public static final KeyBinding KEY_SPRINT = OPTIONS.keyBindSprint; public static final KeyMapping KEY_SPRINT = OPTIONS.keySprint;
public static final KeyBinding KEY_SNEAK = OPTIONS.keyBindSneak; public static final KeyMapping KEY_SNEAK = OPTIONS.keyShift;
public static final KeyBinding KEY_FORWARD = OPTIONS.keyBindForward; public static final KeyMapping KEY_FORWARD = OPTIONS.keyUp;
public static final KeyBinding KEY_JUMP = OPTIONS.keyBindJump; public static final KeyMapping KEY_JUMP = OPTIONS.keyJump;
} }

4
src/main/resources/bettercontrols.mixins.json
View File

@ -8,11 +8,13 @@
"AccessClientPlayerFields", "AccessClientPlayerFields",
"AccessControlsListCategory", "AccessControlsListCategory",
"AccessControlsListKeyBinding", "AccessControlsListKeyBinding",
"AccessGameRendererFields", "AccessCycleButtonFields",
"AccessKeyBindingFields", "AccessKeyBindingFields",
"AccessOptionFields",
"AccessPlayerFields", "AccessPlayerFields",
"AccessScreenButtons", "AccessScreenButtons",
"AccessStickyKeyBindingStateGetter", "AccessStickyKeyBindingStateGetter",
"HookClientPlayerFOV",
"HookClientPlayerInputTick", "HookClientPlayerInputTick",
"HookClientPlayerTick", "HookClientPlayerTick",
"HookControlsListWidget", "HookControlsListWidget",