Skip to content

Commit c9b6e3c

Browse files
Merge remote-tracking branch 'origin/1.14.4-forge' into 1.15.2-forge
2 parents 65b1995 + 2ea0fdb commit c9b6e3c

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/main/java/cam72cam/mod/gui/screen/TextField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ public boolean isEnabled() {
6464

6565
/** Validator that can block a string from being entered */
6666
public void setValidator(Predicate<String> filter) {
67-
internal().setValidator(filter::test);
67+
internal.setValidator(filter::test);
6868
}
6969

7070
/** Move cursor to this text field */
7171
public void setFocused(boolean b) {
72-
internal().setFocused2(b);
72+
internal.setFocused2(b);
7373
}
7474
}

src/main/java/cam72cam/mod/resource/BuiltinPack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public static void loadServerResource(LoadDatapackEvent event) {
147147
}
148148

149149
private static void loadModResource(ModCore.Mod mod, List<IResourcePack> packs) {
150-
String configDir = FMLPaths.CONFIGDIR.toString();
150+
String configDir = FMLPaths.CONFIGDIR.get().toString();
151151
new File(configDir).mkdirs();
152152

153153
IResourcePack modPack = BuiltinPack.attach(ModList.get().getModFileById(mod.modID()).getFile().getFilePath().toFile());

0 commit comments

Comments
 (0)