Skip to content

Commit 1611cf1

Browse files
magnetProgrammingmagnetProgramming
committed
Add support for hiding targeted block and fluid info in F3; clean up code
1 parent e6c1513 commit 1611cf1

File tree

4 files changed

+70
-48
lines changed

4 files changed

+70
-48
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ loader_version=0.16.14
1010
loom_version=1.11-SNAPSHOT
1111

1212
# Mod Properties
13-
mod_version=1.0.0
13+
mod_version=1.1.0
1414
maven_group=com.magnet.streamermodeplusplus
1515
archives_base_name=streamermodeplusplus
1616

‎src/main/java/com/magnet/streamermodeplusplus/Screens/ModMenuScreen.java‎

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,15 @@ public ModMenuScreen() {
2424
}
2525

2626
@Override
27-
protected void init() {
27+
protected void init() {
2828
super.init();
2929

3030
container = new SpruceContainerWidget(Position.of(0, 0), this.width, this.height);
3131
container.setBackground((graphics, widget, vOffset, mouseX, mouseY, delta) -> {
3232
int x = widget.getX();
3333
int y = widget.getY();
3434
int width = widget.getWidth();
35-
3635
graphics.fill(x, y, x + width, y + widget.getHeight(), 0x88000000);
37-
38-
int lineColor = 0xFF444444;
39-
int horizontalInset = 20;
40-
41-
int bottomLineY = y + 140 + 16 + 14 * 4 + 25;
42-
graphics.fill(x + horizontalInset, bottomLineY, x + width - horizontalInset, bottomLineY + 1, lineColor);
4336
});
4437

4538
SpruceLabelWidget label = new SpruceLabelWidget(
@@ -86,29 +79,29 @@ protected void init() {
8679
TooltipData.builder().text("Toggle hiding F3 face info").build()
8780
)
8881
);
89-
82+
9083
optionList.addOptionEntry(
91-
new SpruceCheckboxBooleanOption(
92-
"key.streamermodeplusplus.toggle_hide_F3_targeted_block_info_option",
93-
() -> StreamerModePlusPlusClient.mixinHideTargetedBlockDebugHudEnabled,
94-
newValue -> StreamerModePlusPlusClient.mixinHideTargetedBlockDebugHudEnabled = newValue,
95-
TooltipData.builder().text("Toggle hiding F3 Targeted Block info").build()
96-
),
97-
new SpruceCheckboxBooleanOption(
98-
"key.streamermodeplusplus.toggle_hide_F3_targeted_fluid_info_option",
99-
() -> StreamerModePlusPlusClient.mixinHideTargetedFluidDebugHudEnabled,
100-
newValue -> StreamerModePlusPlusClient.mixinHideTargetedFluidDebugHudEnabled = newValue,
101-
TooltipData.builder().text("Toggle hiding F3 Targeted Fluid info").build()
102-
)
103-
);
84+
new SpruceCheckboxBooleanOption(
85+
"key.streamermodeplusplus.toggle_hide_F3_targeted_block_info_option",
86+
() -> StreamerModePlusPlusClient.mixinHideTargetedBlockDebugHudEnabled,
87+
newValue -> StreamerModePlusPlusClient.mixinHideTargetedBlockDebugHudEnabled = newValue,
88+
TooltipData.builder().text("Toggle hiding F3 Targeted Block info").build()
89+
),
90+
new SpruceCheckboxBooleanOption(
91+
"key.streamermodeplusplus.toggle_hide_F3_targeted_fluid_info_option",
92+
() -> StreamerModePlusPlusClient.mixinHideTargetedFluidDebugHudEnabled,
93+
newValue -> StreamerModePlusPlusClient.mixinHideTargetedFluidDebugHudEnabled = newValue,
94+
TooltipData.builder().text("Toggle hiding F3 Targeted Fluid info").build()
95+
)
96+
);
10497

10598
container.addChild(optionList);
10699

107100
int groupStartX = this.width / 2 - 90;
108-
int groupStartY = 140;
101+
int groupStartY = 130;
109102
int fieldWidth = 180;
110-
int fieldHeight = 12;
111-
int fieldSpacing = 14;
103+
int fieldHeight = 12;
104+
int fieldSpacing = 13;
112105

113106
SpruceLabelWidget hiddenFieldsLabel = new SpruceLabelWidget(
114107
Position.of(groupStartX, groupStartY),
@@ -120,53 +113,63 @@ protected void init() {
120113
container.addChild(hiddenFieldsLabel);
121114

122115
var client = StreamerModePlusPlusClient.getInstance();
116+
int fieldX = groupStartX + 10;
117+
int baseY = groupStartY + 15;
123118

124119
SpruceTextFieldWidget coordField = SpruceTextFieldWidget.builder(
125-
Position.of(groupStartX + 10, groupStartY + 16),
120+
Position.of(fieldX, baseY),
126121
fieldWidth - 20, fieldHeight
127-
).title(Text.of("Coord Text"))
128-
.placeholder(Text.of("Coord Text"))
129-
.build();
122+
).title(Text.of("Coord Text")).placeholder(Text.of("Coord Text")).build();
130123
coordField.setText(client.getHiddenCoordsMessage());
131124
addDrawableChild(coordField);
132125

133126
SpruceTextFieldWidget blockField = SpruceTextFieldWidget.builder(
134-
Position.of(groupStartX + 10, groupStartY + 16 + fieldSpacing),
127+
Position.of(fieldX, baseY + fieldSpacing * 1),
135128
fieldWidth - 20, fieldHeight
136-
).title(Text.of("Block Info Text"))
137-
.placeholder(Text.of("Block Info Text"))
138-
.build();
129+
).title(Text.of("Block Info Text")).placeholder(Text.of("Block Info Text")).build();
139130
blockField.setText(client.getHiddenBlockMessage());
140131
addDrawableChild(blockField);
141132

142133
SpruceTextFieldWidget chunkField = SpruceTextFieldWidget.builder(
143-
Position.of(groupStartX + 10, groupStartY + 16 + fieldSpacing * 2),
134+
Position.of(fieldX, baseY + fieldSpacing * 2),
144135
fieldWidth - 20, fieldHeight
145-
).title(Text.of("Chunk Info Text"))
146-
.placeholder(Text.of("Chunk Info Text"))
147-
.build();
136+
).title(Text.of("Chunk Info Text")).placeholder(Text.of("Chunk Info Text")).build();
148137
chunkField.setText(client.getHiddenChunkMessage());
149138
addDrawableChild(chunkField);
150139

151140
SpruceTextFieldWidget faceField = SpruceTextFieldWidget.builder(
152-
Position.of(groupStartX + 10, groupStartY + 16 + fieldSpacing * 3),
141+
Position.of(fieldX, baseY + fieldSpacing * 3),
153142
fieldWidth - 20, fieldHeight
154-
).title(Text.of("Facing Info Text"))
155-
.placeholder(Text.of("Facing Info Text"))
156-
.build();
143+
).title(Text.of("Facing Info Text")).placeholder(Text.of("Facing Info Text")).build();
157144
faceField.setText(client.getHiddenFaceMessage());
158145
addDrawableChild(faceField);
159146

147+
SpruceTextFieldWidget targetedBlockField = SpruceTextFieldWidget.builder(
148+
Position.of(fieldX, baseY + fieldSpacing * 4),
149+
fieldWidth - 20, fieldHeight
150+
).title(Text.of("Targeted Block Info Text")).placeholder(Text.of("Targeted Block Info Text")).build();
151+
targetedBlockField.setText(client.getHiddenTargetedBlockMessage());
152+
addDrawableChild(targetedBlockField);
153+
154+
SpruceTextFieldWidget targetedFluidField = SpruceTextFieldWidget.builder(
155+
Position.of(fieldX, baseY + fieldSpacing * 5),
156+
fieldWidth - 20, fieldHeight
157+
).title(Text.of("Targeted Fluid Info Text")).placeholder(Text.of("Targeted Fluid Info Text")).build();
158+
targetedFluidField.setText(client.getHiddenTargetedFluidMessage());
159+
addDrawableChild(targetedFluidField);
160+
160161
this.addDrawableChild(new SpruceButtonWidget(
161-
Position.of(groupStartX, groupStartY + 16 + fieldSpacing * 4 + 5),
162+
Position.of(groupStartX, baseY + fieldSpacing * 6 + 3),
162163
fieldWidth,
163-
16,
164+
16,
164165
Text.of("Submit"),
165166
btn -> {
166167
client.setHiddenCoordsMessage(coordField.getText());
167168
client.setHiddenBlockMessage(blockField.getText());
168169
client.setHiddenChunkMessage(chunkField.getText());
169170
client.setHiddenFaceMessage(faceField.getText());
171+
client.setHiddenTargetedBlockMessage(targetedBlockField.getText());
172+
client.setHiddenTargetedFluidMessage(targetedFluidField.getText());
170173
}
171174
));
172175

‎src/main/java/com/magnet/streamermodeplusplus/StreamerModePlusPlusClient.java‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,33 @@ public class StreamerModePlusPlusClient implements ClientModInitializer
3030
public String hiddenBlockMessage = "Block: HIDDEN FROM STREAMERMODE++";
3131
public String hiddenChunkMessage = "Chunk: HIDDEN FROM STREAMERMODE++";
3232
public String hiddenFaceMessage = "Facing: HIDDEN FROM STREAMERMODE++";
33+
public String hiddenTargetedBlockMessage = "Targeted Block: HIDDEN FROM STREAMERMODE++";
34+
public String hiddenTargetedFluidMessage = "Targeted Fluid: HIDDEN FROM STREAMERMODE++";
3335

3436
private static KeyBinding MenuBind;
3537

3638
public static StreamerModePlusPlusClient getInstance() {
3739
return INSTANCE;
3840
}
39-
41+
42+
public String getHiddenTargetedBlockMessage() {
43+
return hiddenTargetedBlockMessage;
44+
}
45+
46+
47+
public void setHiddenTargetedBlockMessage(String hiddenTargetedBlockMessage) {
48+
this.hiddenTargetedBlockMessage = hiddenTargetedBlockMessage;
49+
}
50+
51+
52+
public String getHiddenTargetedFluidMessage() {
53+
return hiddenTargetedFluidMessage;
54+
}
55+
56+
public void setHiddenTargetedFluidMessage(String hiddenTargetedFluidMessage) {
57+
this.hiddenTargetedFluidMessage = hiddenTargetedFluidMessage;
58+
}
59+
4060
public String getHiddenFaceMessage() {
4161
return hiddenFaceMessage;
4262
}
@@ -120,11 +140,11 @@ public void onRightRender(List<String> lines) {
120140
String line = lines.get(i);
121141

122142
if (mixinHideTargetedBlockDebugHudEnabled && line.contains("Targeted Block:")) {
123-
lines.set(i, "Targeted Block: " + StreamerModePlusPlusClient.INSTANCE.hiddenBlockMessage);
143+
lines.set(i, StreamerModePlusPlusClient.INSTANCE.hiddenTargetedBlockMessage);
124144
}
125145

126146
if (mixinHideTargetedFluidDebugHudEnabled && line.contains("Targeted Fluid:")) {
127-
lines.set(i, "Targeted Fluid: " + StreamerModePlusPlusClient.INSTANCE.hiddenBlockMessage);
147+
lines.set(i, StreamerModePlusPlusClient.INSTANCE.hiddenTargetedFluidMessage);
128148
}
129149
}
130150
}

‎src/main/java/com/magnet/streamermodeplusplus/mixins/MixinDebugHud.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ private void onGetRightText(CallbackInfoReturnable<List<String>> cir) {
4040
try
4141
{
4242
EventDebugHud.EVENT.invoker().onRightRender(rightLines);
43-
System.out.println("Success");
4443
} catch (Exception ex)
4544
{
4645
System.out.println(ex.toString());

0 commit comments

Comments
 (0)