Skip to content
This repository was archived by the owner on Jun 1, 2023. It is now read-only.

Commit 3af98f4

Browse files
thejudge156thejudge156
committed
Fixes.
1 parent 0dde907 commit 3af98f4

10 files changed

Lines changed: 35 additions & 91 deletions

File tree

‎gradle.properties‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,4 @@ questcraft_version = 1.4
1818
pehkui_version=3.3.2
1919
joml_version=1.10.4
2020
night_config_version=3.6.5
21-
quilt_mappings=1
22-
23-
flywheel_version=1.18-0.7.0.26
21+
quilt_mappings=1

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/compat/create/mixin/CustomRenderTargetMixin.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package net.sorenon.mcxr.play.compat.create.mixin;
22

3-
import com.simibubi.create.foundation.gui.UIRenderHelper;
4-
import org.spongepowered.asm.mixin.Mixin;
5-
import org.spongepowered.asm.mixin.injection.At;
6-
import org.spongepowered.asm.mixin.injection.Redirect;
7-
3+
/*
84
@Mixin(UIRenderHelper.CustomRenderTarget.class)
95
public class CustomRenderTargetMixin {
106
@Redirect(method = "create", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/foundation/gui/UIRenderHelper$CustomRenderTarget;enableStencil()V"), remap = false)
117
private static void disableStencil(UIRenderHelper.CustomRenderTarget instance) {
128
139
}
1410
}
11+
*/

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/compat/create/mixin/FlwConfigMixin.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.sorenon.mcxr.play.compat.create.mixin;
22

3+
/*
34
import com.jozufozu.flywheel.config.BackendType;
45
import com.jozufozu.flywheel.config.FlwConfig;
56
import com.jozufozu.flywheel.config.Option;
@@ -24,3 +25,5 @@ public void FlwConfig(FlwConfig instance, Option.EnumOption<BackendType> value)
2425
this.backend = this.addOption(new Option.EnumOption<>("backend", BackendType.OFF));
2526
}
2627
}
28+
29+
*/

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/gui/XrEditBoxScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public XrEditBoxScreen(Component title, Screen parentscreen, EditBox textField,
2727
this.keyboard = new XrEditBoxKeyboard(textField, this, 30);
2828
this.servers = servers;
2929
this.servers.load();
30-
this.parentScreen = parentScreen;
30+
this.parentScreen = parentscreen;
3131
}
3232

3333
public Screen getParentScreen() {

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/gui/keyboard/XrAbstract2DKeyboard.java‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package net.sorenon.mcxr.play.gui.keyboard;
22

33
import net.minecraft.client.gui.components.Button;
4-
<<<<<<< HEAD
5-
import net.minecraft.network.chat.TextComponent;
6-
=======
74
import net.minecraft.network.chat.Component;
8-
>>>>>>> motion-controls
95

106
public abstract class XrAbstract2DKeyboard {
117

@@ -77,33 +73,6 @@ public void renderKeyboard(char[][] charset, int width, int height, int buttonwi
7773

7874
case '\r' ->
7975
new Button(buttonX, buttonY, buttonwidth * 2, 20,
80-
<<<<<<< HEAD
81-
new TextComponent("Enter"),
82-
this::returnButton);
83-
case '\b' ->
84-
new Button(buttonX, buttonY, buttonwidth, 20,
85-
new TextComponent("Bksp"),
86-
this::backSpaceButton);
87-
case ' ' ->
88-
new Button(buttonX + 150, buttonY, buttonwidth + 100, 20,
89-
new TextComponent("Space"),
90-
this::spaceButton);
91-
case '\t' ->
92-
new Button(buttonX, buttonY, buttonwidth, 20,
93-
new TextComponent("Tab"),
94-
this::tabButton);
95-
case '\n' ->
96-
new Button(buttonX, buttonY, buttonwidth * 2, 20,
97-
new TextComponent("Shift"),
98-
this::shiftButton);
99-
case '\f' ->
100-
new Button(buttonX, buttonY, buttonwidth, 20,
101-
new TextComponent("Caps"),
102-
this::capsButton);
103-
default ->
104-
new Button(buttonX, buttonY, buttonwidth, 20,
105-
new TextComponent(Character.toString(character)),
106-
=======
10776
Component.translatable("Enter"),
10877
this::returnButton);
10978
case '\b' ->
@@ -129,7 +98,6 @@ public void renderKeyboard(char[][] charset, int width, int height, int buttonwi
12998
default ->
13099
new Button(buttonX, buttonY, buttonwidth, 20,
131100
Component.translatable(Character.toString(character)),
132-
>>>>>>> motion-controls
133101
this::letterButton);
134102

135103
};

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/gui/keyboard/XrChatKeyboard.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public void returnButton(Button instance) {
5353
if (chatBox.getValue().equals("")) {
5454
chatScreen.onClose();
5555
} else {
56-
if(_chatBox.getValue().startsWith("/")) {
57-
Minecraft.getInstance().player.command(_chatBox.getValue().substring(1));
58-
_chatScreen.onClose();
56+
if(chatBox.getValue().startsWith("/")) {
57+
Minecraft.getInstance().player.command(chatBox.getValue().substring(1));
58+
chatScreen.onClose();
5959
} else {
60-
Minecraft.getInstance().player.chat(_chatBox.getValue());
61-
_chatScreen.onClose();
60+
Minecraft.getInstance().player.chat(chatBox.getValue());
61+
chatScreen.onClose();
6262
}
6363
}
6464
}

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/gui/keyboard/XrEditBoxKeyboard.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public XrEditBoxKeyboard(EditBox textField, XrEditBoxScreen editScreen, int butt
2626
this.textField = textField;
2727
this.editScreen = editScreen;
2828

29-
_placeholderField = new EditBox(Minecraft.getInstance().font,
30-
133, 22, _textField.getWidth(), _textField.getHeight(),
31-
_textField, Component.translatable(""));
29+
placeholderField = new EditBox(Minecraft.getInstance().font,
30+
133, 22, textField.getWidth(), textField.getHeight(),
31+
textField, Component.translatable(""));
3232

3333
this.buttonWidth = buttonWidth;
3434
}
@@ -50,10 +50,10 @@ public void returnButton(Button instance) {
5050

5151
} else if (editScreen.getParentScreen().getClass() == JoinMultiplayerScreen.class) {
5252

53-
ServerData server = new ServerData(_placeholderField.getValue(), _placeholderField.getValue(), false);
54-
_editScreen.getServers().add(server, false);
55-
_editScreen.getServers().save();
56-
Minecraft.getInstance().setScreen(_editScreen.getParentScreen());
53+
ServerData server = new ServerData(placeholderField.getValue(), placeholderField.getValue(), false);
54+
editScreen.getServers().add(server, false);
55+
editScreen.getServers().save();
56+
Minecraft.getInstance().setScreen(editScreen.getParentScreen());
5757

5858

5959
} else if (editScreen.getParentScreen().getClass() == CreativeModeInventoryScreen.class) {

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/gui/keyboard/XrSignKeyboard.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ public class XrSignKeyboard extends XrAbstract2DKeyboard {
2121

2222
public XrSignKeyboard(XrSignEditScreen signEditScreen) {
2323

24-
_signEditScreen = signEditScreen;
25-
_textField1 = new EditBox(Minecraft.getInstance().font,
26-
(_signEditScreen.width /3) - 160, 0, 160, 10, Component.translatable(""));
27-
_textField2 = new EditBox(Minecraft.getInstance().font,
28-
(_signEditScreen.width /3) - 160, 10, 160, 10, Component.translatable(""));
29-
_textField3 = new EditBox(Minecraft.getInstance().font,
30-
(_signEditScreen.width /3) - 160, 20, 160, 10, Component.translatable(""));
31-
_textField4 = new EditBox(Minecraft.getInstance().font,
32-
(_signEditScreen.width /3) - 160, 30, 160, 10, Component.translatable(""));
24+
this.signEditScreen = signEditScreen;
25+
textField1 = new EditBox(Minecraft.getInstance().font,
26+
(signEditScreen.width /3) - 160, 0, 160, 10, Component.translatable(""));
27+
textField2 = new EditBox(Minecraft.getInstance().font,
28+
(signEditScreen.width /3) - 160, 10, 160, 10, Component.translatable(""));
29+
textField3 = new EditBox(Minecraft.getInstance().font,
30+
(signEditScreen.width /3) - 160, 20, 160, 10, Component.translatable(""));
31+
textField4 = new EditBox(Minecraft.getInstance().font,
32+
(signEditScreen.width /3) - 160, 30, 160, 10, Component.translatable(""));
3333

3434
activeTextField = textField1;
3535
}
3636

3737
@Override
3838
public void returnButton(Button instance) {
39-
_signEditScreen.getSign().setMessage(0, Component.translatable(_textField1.getValue()));
40-
_signEditScreen.getSign().setMessage(1, Component.translatable(_textField2.getValue()));
41-
_signEditScreen.getSign().setMessage(2, Component.translatable(_textField3.getValue()));
42-
_signEditScreen.getSign().setMessage(3, Component.translatable(_textField4.getValue()));
43-
_signEditScreen.onClose();
39+
signEditScreen.getSign().setMessage(0, Component.translatable(textField1.getValue()));
40+
signEditScreen.getSign().setMessage(1, Component.translatable(textField2.getValue()));
41+
signEditScreen.getSign().setMessage(2, Component.translatable(textField3.getValue()));
42+
signEditScreen.getSign().setMessage(3, Component.translatable(textField4.getValue()));
43+
signEditScreen.onClose();
4444
}
4545

4646
public EditBox getTextField1() {

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/input/XrInput.java‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public final class XrInput {
5959
public static final GuiActionSet guiActionSet = new GuiActionSet();
6060

6161
private static long lastPollTime = 0;
62-
private static long turnTime = 0;
6362
private static Pose gripPointOld = new Pose();
6463
private static boolean reachBack = false;
6564
public static int eatDelay = 0;
@@ -73,6 +72,7 @@ public final class XrInput {
7372
public static boolean teleport = false;
7473

7574
public static float lastHealth = 0;
75+
private static Vec3 gripPosOld;
7676

7777
private XrInput() {
7878
}
@@ -433,29 +433,6 @@ else if (lastHit.getLocation().distanceTo(newHit.getLocation()) < 0.3) {//contin
433433
}
434434
}
435435

436-
if (actionSet.sprintAnalog.changedSinceLastSync) {
437-
float value = actionSet.sprintAnalog.currentState;
438-
Minecraft client = Minecraft.getInstance();
439-
if (value > 0.8f && !actionSet.sprintAnalogOn) {//sprint
440-
actionSet.sprintAnalogOn=true;
441-
client.options.keySprint.setDown(true);
442-
//disable sneak
443-
if (actionSet.sneakAnalogOn){
444-
actionSet.sneakAnalogOn=false;
445-
client.options.keyShift.setDown(false);
446-
if (client.player != null) {
447-
client.player.setShiftKeyDown(true);
448-
}
449-
}
450-
} else if (actionSet.sprintAnalogOn && value < 0.6f){
451-
actionSet.sprintAnalogOn=false;
452-
client.options.keySprint.setDown(false);
453-
if (client.player != null) {
454-
client.player.setSprinting(false);
455-
}
456-
}
457-
}
458-
459436
if (actionSet.sneak.changedSinceLastSync) {
460437
Minecraft client = Minecraft.getInstance();
461438
InputConstants.Key key = client.options.keySwapOffhand.getDefaultKey();

‎mcxr-play/src/main/java/net/sorenon/mcxr/play/openxr/MCXRGameRenderer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import net.sorenon.mcxr.play.MCXRPlayClient;
4343
import net.sorenon.mcxr.play.PlayOptions;
4444
import net.sorenon.mcxr.play.accessor.MinecraftExt;
45+
import net.sorenon.mcxr.play.input.XrInput;
4546
import net.sorenon.mcxr.play.input.actionsets.VanillaGameplayActionSet;
4647
import net.sorenon.mcxr.play.rendering.MCXRCamera;
4748
import net.sorenon.mcxr.play.rendering.MCXRMainTarget;

0 commit comments

Comments
 (0)