diff --git a/.gitignore b/.gitignore
index d4865f33..e91a423b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 /.metadata/
 /.settings/
 /libs/
+/logs/
 
 # File Extensions
 *.psd
diff --git a/build.gradle b/build.gradle
index 8927bdbc..02af7771 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ group = "mcp.mobius.waila"
 archivesBaseName = "Hwyla-forge"
 
 minecraft {
-    mappings channel: "snapshot", version: "20200723-1.16.1"
+    mappings channel: "snapshot", version: "20201028-1.16.3"
 
     runs {
         client {
@@ -160,10 +160,10 @@ curseforge {
         changelog = getChangelogText()
         releaseType = 'release'
 
-        addGameVersion "1.16.1"
+        addGameVersion "1.16.4"
         addGameVersion "Forge"
 
         addArtifact sourcesJar
         addArtifact apiJar
     }
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index dd4762fc..f28e03ca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx3G
 
-mc_version=1.16.2
-forge_version=33.0.0
+mc_version=1.16.4
+forge_version=35.0.1
 
 waila_version=1.10.11
 curse_id=253449
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f5095af5..6b071a78 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
diff --git a/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerVanilla.java
index d07c9392..c79688ef 100644
--- a/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerVanilla.java
+++ b/src/main/java/mcp/mobius/waila/addons/minecraft/HUDHandlerVanilla.java
@@ -96,7 +96,7 @@ public void appendBody(List<ITextComponent> tooltip, IDataAccessor accessor, IPl
 
         if (config.get(PluginMinecraft.CONFIG_JUKEBOX) && accessor.getBlock() == Blocks.JUKEBOX) {
             if (accessor.getServerData().contains("record"))
-                tooltip.add(new TranslationTextComponent("record.nowPlaying", ITextComponent.Serializer.func_240643_a_(accessor.getServerData().getString("record"))));
+                tooltip.add(new TranslationTextComponent("record.nowPlaying", ITextComponent.Serializer.getComponentFromJsonLenient(accessor.getServerData().getString("record"))));
             else
                 tooltip.add(new TranslationTextComponent("tooltip.waila.empty"));
         }
diff --git a/src/main/java/mcp/mobius/waila/gui/GuiOptions.java b/src/main/java/mcp/mobius/waila/gui/GuiOptions.java
index 74089e0a..f8898e03 100644
--- a/src/main/java/mcp/mobius/waila/gui/GuiOptions.java
+++ b/src/main/java/mcp/mobius/waila/gui/GuiOptions.java
@@ -80,7 +80,7 @@ public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partia
                     return;
 
                 List<IReorderingProcessor> tooltip = Arrays.asList(new StringTextComponent(title).func_241878_f());
-                tooltip.addAll(font.func_238425_b_(new TranslationTextComponent(value.getDescription()), 200));
+                tooltip.addAll(font.trimStringToWidth(new TranslationTextComponent(value.getDescription()), 200));
                 renderTooltip(matrixStack, tooltip, mouseX, mouseY);
             }
         }
diff --git a/src/main/resources/META-INF/mods.json b/src/main/resources/META-INF/mods.json
index a0ea24e0..abe14f13 100644
--- a/src/main/resources/META-INF/mods.json
+++ b/src/main/resources/META-INF/mods.json
@@ -1,6 +1,6 @@
 {
   "modLoader": "javafml",
-  "loaderVersion": "[33,)",
+  "loaderVersion": "[35,)",
   "issueTrackerURL": "https://github.com/TehNut/Hwyla/issues",
   "displayURL": "https://github.com/TehNut/Hwyla",
   "authors": "TehNut, ProfMobius",
@@ -18,14 +18,14 @@
       {
         "modId": "forge",
         "mandatory": true,
-        "versionRange": "[33.0.0,)",
+        "versionRange": "[35.0.0,)",
         "ordering": "NONE",
         "side": "BOTH"
       },
       {
         "modId": "minecraft",
         "mandatory": true,
-        "versionRange": "[1.16.2,)",
+        "versionRange": "[1.16.4,)",
         "ordering": "NONE",
         "side": "BOTH"
       }