🔖 LambdaControls v1.0.0

This commit is contained in:
LambdAurora
2019-12-19 20:25:51 +01:00
parent 2e6b2f8434
commit 8ac0ee175f
7 changed files with 15 additions and 10 deletions

View File

@@ -467,7 +467,7 @@ public class LambdaInput
private void handle_rb_lb(@NotNull MinecraftClient client, boolean right)
{
// When ingame
if (client.currentScreen == null) {
if (client.currentScreen == null && client.player != null) {
if (right)
client.player.inventory.selectedSlot = client.player.inventory.selectedSlot == 8 ? 0 : client.player.inventory.selectedSlot + 1;
else
@@ -523,7 +523,8 @@ public class LambdaInput
{
Element focused = screen.getFocused();
if (focused != null)
return this.handle_right_left_element(focused, right);
if (this.handle_right_left_element(focused, right))
return this.change_focus(screen, right);
return true;
}

View File

@@ -16,6 +16,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.util.Window;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
@@ -25,8 +26,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(MinecraftClient.class)
public abstract class MinecraftClientMixin
{
@Final
@Shadow
public Window window;
private Window window;
@Shadow
public boolean skipGameRender;

View File

@@ -15,15 +15,12 @@ import net.minecraft.client.gui.screen.SettingsScreen;
import net.minecraft.client.gui.widget.AbstractButtonWidget;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.options.GameOptions;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/**
* Injects the new controls settings button.