diff --git a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java index e1e795d76..9c697907d 100644 --- a/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java +++ b/common/src/main/java/com/gitlab/cdagaming/craftpresence/utils/server/ServerUtils.java @@ -631,11 +631,11 @@ private void pingServer(final ServerData serverData, final Runnable saver, final callbackEvent.run(); } catch (UnknownHostException unknownHostException) { serverData.pingToServer = -1L; - serverData.serverMOTD = "§4" + ModUtils.RAW_TRANSLATOR.translate("multiplayer.status.cannot_resolve"); + serverData.serverMOTD = "§4Can't resolve hostname"; callbackEvent.run(); } catch (Exception ex) { serverData.pingToServer = -1L; - serverData.serverMOTD = "§4" + ModUtils.RAW_TRANSLATOR.translate("multiplayer.status.cannot_connect"); + serverData.serverMOTD = "§4Can't connect to server."; callbackEvent.run(); } }); diff --git a/forge/src/main/java/com/gitlab/cdagaming/craftpresence/forge/config/ConfigGuiDataFactory.java b/forge/src/main/java/com/gitlab/cdagaming/craftpresence/forge/config/ConfigGuiDataFactory.java index 77c51cb70..5304f972d 100644 --- a/forge/src/main/java/com/gitlab/cdagaming/craftpresence/forge/config/ConfigGuiDataFactory.java +++ b/forge/src/main/java/com/gitlab/cdagaming/craftpresence/forge/config/ConfigGuiDataFactory.java @@ -29,6 +29,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.fml.client.IModGuiFactory; +import javax.annotation.Nullable; import java.util.Set; /** @@ -45,6 +46,12 @@ public Set runtimeGuiCategories() { return null; } + @Nullable + @Override + public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { + return null; + } + @Override public boolean hasConfigGui() { return true; @@ -54,4 +61,9 @@ public boolean hasConfigGui() { public GuiScreen createConfigGui(GuiScreen parentScreen) { return new MainGui(parentScreen); } + + @Override + public Class mainConfigGuiClass() { + return MainGui.class; + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index cb76862c9..0c21d9c88 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,20 +11,20 @@ enabled_platforms=fabric,forge isLegacy=false isJarMod=false # Mapping Info -mc_mappings=39-1.12 +mc_mappings=32-1.11 mc_mappings_type=mcp -mc_version=1.12.2 -mc_protocol=340 +mc_version=1.11.2 +mc_protocol=316 display_version= # Fabric Info fabric_loader_version=0.16.9 fabric_api_version= -fabric_game_version_range=1.12.2 +fabric_game_version_range=1.11.2 fabric_loader_version_range=>=0.13.0 # Forge Info -forge_version=14.23.5.2860 +forge_version=13.20.1.2588 fml_version_range= -forge_game_version_range=1.12.2 +forge_game_version_range=1.11.2 forge_loader_version_range= # Deployment Info versionId=2.5.3