chylex/Better-Controls
1
0
Fork 0
mirror of https://github.com/chylex/Better-Controls.git synced 2025-11-04 03:40:14 +01:00
Code Activity

Compare commits

base: chylex:8d5536cc69e8d108968ca3475bd42b865639c24d
Branches Tags
chylex:main chylex:1.20 chylex:1.19 chylex:1.18 chylex:1.17 chylex:fabric/1.17 chylex:forge/1.17 chylex:forge/1.15 chylex:forge/1.16 chylex:fabric/1.15 chylex:fabric/1.16
..
compare: chylex:7895b0dc0fb438534574e575ba582fdf68ce24b2
Branches Tags
chylex:main chylex:1.20 chylex:1.19 chylex:1.18 chylex:1.17 chylex:fabric/1.17 chylex:forge/1.17 chylex:forge/1.15 chylex:forge/1.16 chylex:fabric/1.15 chylex:fabric/1.16

2 Commits
8d5536cc69 ... 7895b0dc0f

Author SHA1 Message Date
chylex
7895b0dc0f Release v1.3.0b for Minecraft 1.20.3+ 2023-12-12 18:22:17 +01:00
chylex
1fe1234bac Update for Minecraft 1.20.3 2023-12-12 18:22:16 +01:00
5 changed files with 20 additions and 17 deletions
Expand all files Collapse all files

10
gradle.properties
View File

@@ -3,21 +3,21 @@ modId=bettercontrols
modName=Better Controls modName=Better Controls
modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine. modDescription=Adds many powerful key bindings and options to control your movement.\\n\\nThe features complement vanilla mechanics without giving unfair advantages, so server use should be fine.
modAuthor=chylex modAuthor=chylex
modVersion=1.3.0a modVersion=1.3.0b
modLicense=MPL-2.0 modLicense=MPL-2.0
modSourcesURL=https://github.com/chylex/Better-Controls modSourcesURL=https://github.com/chylex/Better-Controls
modIssuesURL=https://github.com/chylex/Better-Controls/issues modIssuesURL=https://github.com/chylex/Better-Controls/issues
# Dependencies # Dependencies
minecraftVersion=1.20.2 minecraftVersion=1.20.3
neoForgeVersion=20.2.86 neoForgeVersion=20.3.8-beta
fabricVersion=0.14.21 fabricVersion=0.14.21
loomVersion=1.3 loomVersion=1.3
mixinVersion=0.8.5 mixinVersion=0.8.5
# Constraints # Constraints
minimumMinecraftVersion=1.20.2 minimumMinecraftVersion=1.20.3
minimumNeoForgeVersion=20.2.86 minimumNeoForgeVersion=20.3.7
minimumFabricVersion=0.12.3 minimumFabricVersion=0.12.3
# Gradle # Gradle

6
settings.gradle.kts
View File

@@ -10,9 +10,9 @@ pluginManagement {
plugins { plugins {
if (settings.extra.has("neoForgeVersion")) { if (settings.extra.has("neoForgeVersion")) {
id("net.neoforged.gradle.vanilla") version "7.0.41" id("net.neoforged.gradle.vanilla") version "7.0.61"
id("net.neoforged.gradle.userdev") version "7.0.41" id("net.neoforged.gradle.userdev") version "7.0.61"
id("net.neoforged.gradle.mixin") version "7.0.41" id("net.neoforged.gradle.mixin") version "7.0.61"
} }
if (settings.extra.has("loomVersion")) { if (settings.extra.has("loomVersion")) {

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

@@ -234,9 +234,9 @@ public class BetterControlsScreen extends OptionsSubScreen {
y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP; y = generateMiscellaneousOptions(y + ROW_HEIGHT, elements) + TITLE_MARGIN_TOP;
//noinspection DataFlowIssue //noinspection DataFlowIssue
addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)).pos(width / 2 - 99, height - 29).size(200, 20).build()); addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> minecraft.setScreen(lastScreen)).pos(width / 2 - 99, height - 25).size(200, 20).build());
addRenderableWidget(optionsWidget = new OptionListWidget(21, height - 32, width, height, elements, y - TITLE_MARGIN_TOP + BOTTOM_PADDING)); addRenderableWidget(optionsWidget = new OptionListWidget(width, height - 50, 21, y - TITLE_MARGIN_TOP + BOTTOM_PADDING, elements));
} }
@Override @Override
@@ -244,12 +244,15 @@ public class BetterControlsScreen extends OptionsSubScreen {
BetterControlsCommon.getConfig().save(); BetterControlsCommon.getConfig().save();
} }
@Override
public void renderBackground(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
renderDirtBackground(graphics);
}
@Override @Override
public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) { public void render(final @NotNull GuiGraphics graphics, final int mouseX, final int mouseY, final float delta) {
renderBackground(graphics, mouseX, mouseY, delta);
optionsWidget.render(graphics, mouseX, mouseY, delta);
graphics.drawCenteredString(font, title, width / 2, 8, TextWidget.WHITE);
super.render(graphics, mouseX, mouseY, delta); super.render(graphics, mouseX, mouseY, delta);
graphics.drawCenteredString(font, title, width / 2, 8, TextWidget.WHITE);
} }
private void startEditingKeyBinding(final KeyBindingWidget widget) { private void startEditingKeyBinding(final KeyBindingWidget widget) {

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

@@ -54,8 +54,8 @@ public final class OptionListWidget extends ContainerObjectSelectionList<Entry>
private record Offset(int x, int y) {} private record Offset(int x, int 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 width, final int height, final int top, final int innerHeight, final List<GuiEventListener> widgets) {
super(Minecraft.getInstance(), width, height, top, bottom, innerHeight); super(Minecraft.getInstance(), width, height, top, innerHeight);
addEntry(new Entry(widgets)); addEntry(new Entry(widgets));
} }

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

@@ -14,8 +14,8 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(KeyBindsList.class) @Mixin(KeyBindsList.class)
public abstract class HookControlsListWidget extends ContainerObjectSelectionList<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 itemHeight) {
super(client, width, height, top, bottom, itemHeight); super(client, width, height, top, itemHeight);
} }
@Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;")) @Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/Options;keyMappings:[Lnet/minecraft/client/KeyMapping;"))