djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

fix crash with gamepad binds

Browse Source
This commit is contained in:
isXander
2023-02-19 23:16:52 +00:00
parent 861f97be3c
commit 773cfa32fe
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/dev/isxander/controlify/bindings/GamepadBind.java
View File

@ -12,19 +12,18 @@ import dev.isxander.controlify.gui.DrawSize;
import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.GuiComponent;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import java.util.Objects;
import java.util.function.Function; import java.util.function.Function;
public class GamepadBind implements IBind<GamepadState> { public class GamepadBind implements IBind<GamepadState> {
private final Function<GamepadState, Float> stateSupplier; private final Function<GamepadState, Float> stateSupplier;
private final String identifier; private final String identifier;
private final GamepadController gamepad; private final GamepadController gamepad;
private final ResourceLocation defaultTexture;
public GamepadBind(Function<GamepadState, Float> stateSupplier, String identifier, GamepadController gamepad) { public GamepadBind(Function<GamepadState, Float> stateSupplier, String identifier, GamepadController gamepad) {
this.stateSupplier = stateSupplier; this.stateSupplier = stateSupplier;
this.identifier = identifier; this.identifier = identifier;
this.gamepad = gamepad; this.gamepad = gamepad;
this.defaultTexture = new ResourceLocation("controlify", "textures/gui/gamepad_buttons/" + gamepad.config().theme.id() + "/" + identifier + ".png");
} }
@Override @Override
@ -65,8 +64,22 @@ public class GamepadBind implements IBind<GamepadState> {
} }
private ResourceLocation getTexture(BuiltinGamepadTheme theme) { private ResourceLocation getTexture(BuiltinGamepadTheme theme) {
String themeId = theme.id();
if (theme == BuiltinGamepadTheme.DEFAULT) if (theme == BuiltinGamepadTheme.DEFAULT)
return defaultTexture; themeId = gamepad.type().identifier();
return new ResourceLocation("controlify", "textures/gui/gamepad_buttons/" + theme.id() + "/" + identifier + ".png"); return new ResourceLocation("controlify", "textures/gui/gamepad/" + themeId + "/" + identifier + ".png");
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
GamepadBind that = (GamepadBind) o;
return identifier.equals(that.identifier);
}
@Override
public int hashCode() {
return Objects.hash(identifier);
} }
} }