Skip to content

Commit b6b7fe8

Browse files
committed
Added an icon for the Non-Owned Script Settings Menu.
(also I made closing that menu actually save the script, my bad)
1 parent 3b2073f commit b6b7fe8

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptListScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public boolean mouseClicked(double x, double y, int button) {
214214
}
215215
else {
216216
//Script Settings Button
217-
CButton settings = new CTexturedButton(10 + addedX, y + addedY, 8, 8, DFScript.MOD_ID + ":wrench.png", () -> {
217+
CButton settings = new CTexturedButton(10 + addedX, y + addedY, 8, 8, DFScript.MOD_ID + ":settings.png", () -> {
218218
DFScript.MC.setScreen(new ScriptSettingsScreen(s, false));
219219
}, 0, 0, 1, 0.5f, 0, 0.5f);
220220

src/main/java/io/github/techstreet/dfscript/screen/script/ScriptSettingsScreen.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,13 @@ public boolean mouseClicked(double x, double y, int button) {
137137

138138
@Override
139139
public void close() {
140-
DFScript.MC.setScreen(owned ? new ScriptEditScreen(script) : new ScriptListScreen(true));
140+
if (owned) {
141+
DFScript.MC.setScreen(new ScriptEditScreen(script));
142+
}
143+
else {
144+
ScriptManager.getInstance().saveScript(script);
145+
DFScript.MC.setScreen(new ScriptListScreen(true));
146+
}
141147
}
142148

143149
public boolean mouseClicked(double mouseX, double mouseY, int button) {

src/main/java/io/github/techstreet/dfscript/script/options/ScriptNamedOption.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.github.techstreet.dfscript.script.Script;
77
import io.github.techstreet.dfscript.script.ScriptPart;
88
import io.github.techstreet.dfscript.script.argument.ScriptArgument;
9+
import io.github.techstreet.dfscript.util.chat.ChatUtil;
910
import net.minecraft.item.ItemStack;
1011
import net.minecraft.text.Style;
1112
import net.minecraft.text.Text;
@@ -77,7 +78,9 @@ public JsonElement serialize(ScriptNamedOption src, Type typeOfSrc, JsonSerializ
7778

7879
object.addProperty("type", src.getOption().getType());
7980

80-
object.add("value", src.getOption().getJsonPrimitive());
81+
JsonPrimitive primitive = src.getOption().getJsonPrimitive();
82+
83+
object.add("value", primitive);
8184

8285
return object;
8386
}

src/main/java/io/github/techstreet/dfscript/script/options/ScriptOption.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.github.techstreet.dfscript.script.options;
22

33
import com.google.gson.JsonElement;
4+
import com.google.gson.JsonPrimitive;
45
import io.github.techstreet.dfscript.screen.widget.CScrollPanel;
56
import io.github.techstreet.dfscript.script.argument.ScriptArgument;
67
import net.minecraft.item.Item;
@@ -16,5 +17,5 @@ public interface ScriptOption {
1617

1718
String getType();
1819

19-
JsonElement getJsonPrimitive();
20+
JsonPrimitive getJsonPrimitive();
2021
}

src/main/java/io/github/techstreet/dfscript/script/options/ScriptTextOption.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public String getType() {
4848
}
4949

5050
@Override
51-
public JsonElement getJsonPrimitive() {
51+
public JsonPrimitive getJsonPrimitive() {
5252
return new JsonPrimitive(value);
5353
}
5454
}
11.4 KB
Loading

0 commit comments

Comments
 (0)