Skip to content

Commit b558c8f

Browse files
Merge remote-tracking branch 'origin/1.15.2-forge' into 1.16.5-forge
2 parents 206d9a3 + c9b6e3c commit b558c8f

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
@@ -68,11 +68,11 @@ public boolean isEnabled() {
6868

6969
/** Validator that can block a string from being entered */
7070
public void setValidator(Predicate<String> filter) {
71-
internal().setFilter(filter);
71+
internal.setFilter(filter);
7272
}
7373

7474
/** Move cursor to this text field */
7575
public void setFocused(boolean b) {
76-
internal().setFocus(b);
76+
internal.setFocus(b);
7777
}
7878
}

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

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

144144
private static void loadModResource(ModCore.Mod mod, List<IResourcePack> packs) {
145-
String configDir = FMLPaths.CONFIGDIR.toString();
145+
String configDir = FMLPaths.CONFIGDIR.get().toString();
146146
new File(configDir).mkdirs();
147147

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

0 commit comments

Comments
 (0)