Leisuretimedock/webdisplays
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
GiantLuigi4 2023-05-31 15:31:23 -04:00
commit 5780cd1199
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -72,10 +72,10 @@ repositories{
}
dependencies {
minecraft 'net.minecraftforge:forge:1.19.2-43.2.6'
minecraft 'net.minecraftforge:forge:1.19.2-43.2.10'
annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:51cf5945f3")
implementation fg.deobf("com.github.Mysticpasta1:mcef-forge:17731a6bbb")
implementation fg.deobf("curse.maven:cloth_config_forge-348521:3972423")
implementation fg.deobf("curse.maven:SU-370704:4410614")
implementation fg.deobf("curse.maven:spark-361579:4381167")

4
src/main/java/net/montoyo/wd/client/gui/GuiKeyboard.java
View File

@ -207,7 +207,7 @@ public class GuiKeyboard extends WDScreen {
private boolean hasUserReadWarning() {
try {
File f = new File(FMLPaths.GAMEDIR.name(), WARNING_FNAME);
File f = new File(FMLPaths.GAMEDIR.get().toString(), WARNING_FNAME);
if(f.exists()) {
BufferedReader br = new BufferedReader(new FileReader(f));
@ -225,7 +225,7 @@ public class GuiKeyboard extends WDScreen {
private void writeUserAcknowledge() {
try {
File f = new File(FMLPaths.GAMEDIR.name(), WARNING_FNAME);
File f = new File(FMLPaths.GAMEDIR.get().toString(), WARNING_FNAME);
BufferedWriter bw = new BufferedWriter(new FileWriter(f));
bw.write("read\n");

6
src/main/resources/assets/webdisplays/lang/en_us.json
View File

@ -93,9 +93,9 @@
"webdisplays.extcard.cantcraft2": "You WILL FAIL at crafting this item.",
"webdisplays.extcard.bad": "Someone failed at crafting an extension card",
"webdisplays.gui.keyboard.hooked": "Keyboard hooked. Press escape to leave.",
"webdisplays.gui.keyboard.warning1": "WARNING! Typed data are sent in PLAIN T,EXT to the server.",
"webdisplays.gui.keyboard.warning2": "This means anyone can know what you're ,up to.",
"webdisplays.gui.keyboard.warning3": "NEVER write one of your passwords using, this keyboard.",
"webdisplays.gui.keyboard.warning1": "WARNING! Typed data are sent in PLAIN TEXT to the server.",
"webdisplays.gui.keyboard.warning2": "This means anyone can know what you're up to.",
"webdisplays.gui.keyboard.warning3": "NEVER write one of your passwords using this keyboard.",
"webdisplays.gui.keyboard.gotcha": "Got ya",
"advancements.webdisplays.root.title": "WebDisplays",
"advancements.webdisplays.root.description": "The WebDisplays mod",