diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java index f01b80b8..01d88376 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java +++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java @@ -29,7 +29,7 @@ public void setClient(Client client) @Override public void channelActive(ChannelHandlerContext ctx) { - LogHelper.debug("New client %s", IOHelper.getIP(ctx.channel().remoteAddress())); + LogHelper.dev("New client %s", IOHelper.getIP(ctx.channel().remoteAddress())); client = new Client(0); service.registerClient(ctx.channel()); ctx.executor().schedule(() -> { diff --git a/Launcher/build.gradle b/Launcher/build.gradle index c13447cf..208d74cf 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -38,9 +38,9 @@ dependencies { pack project(':LauncherAuthlib') bundle 'com.github.oshi:oshi-core:3.13.0' - bundle 'com.jfoenix:jfoenix:8.0.8' + bundle 'com.jfoenix:jfoenix:8.0.8' bundle 'de.jensd:fontawesomefx:8.9' - bundle 'org.apache.httpcomponents:httpclient:4.5.7' + bundle 'org.apache.httpcomponents:httpclient:4.5.7' pack 'io.netty:netty-all:4.1.36.Final' pack 'org.ow2.asm:asm-tree:7.1' } diff --git a/Launcher/runtime/dialog/dialog.js b/Launcher/runtime/dialog/dialog.js index 0cff19d2..cfc3a805 100644 --- a/Launcher/runtime/dialog/dialog.js +++ b/Launcher/runtime/dialog/dialog.js @@ -80,16 +80,13 @@ function initMenuScene() { stage.setY(event.getScreenY() - movePoint.getY()); }); - var pane = loginPane.lookup("#bar"); + var pane = menuPane.lookup("#bar"); bar = pane; - menuPane.lookup("#close").setOnAction(function(event){ javafx.application.Platform.exit()}); - menuPane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)}); - menuPane.lookup("#discord").setOnAction(function(){ openURL(config.discord); }); - menuPane.lookup("#settings").setOnAction(goSettings); - menuPane.lookup("#goConsole").setOnAction(goConsole); - menuPane.lookup("#logout").setOnAction(function(){ - setCurrentScene(loginScene); - }); + pane.lookup("#close").setOnAction(function(event){ javafx.application.Platform.exit()}); + pane.lookup("#hide").setOnAction(function(event){ stage.setIconified(true)}); + pane.lookup("#discord").setOnAction(function(){ openURL(config.discord); }); + pane.lookup("#settings").setOnAction(goSettings); + pane.lookup("#goConsole").setOnAction(goConsole); var pane = menuPane.lookup("#serverPane"); serverPane = pane; @@ -104,6 +101,9 @@ function initMenuScene() { serverEntrance.lookup("#clientLaunch").setOnAction(function(){ doUpdate(profilesList[serverHolder.old], loginData.pp, loginData.accessToken); }); + pane.lookup("#logout").setOnAction(function(){ + setCurrentScene(loginScene); + }); } @@ -236,21 +236,17 @@ function verifyLauncher(e) { initOffline(); } overlay.swap(0, processing.overlay, function(event) makeAuthAvailabilityRequest(function(result) { - //@DrLeonardo нужно напистаь добавление в список - //result.list весь список - //result.list[0].name имя авторизации(не видно) - //result.list[0].displayName имя авторизации(видно) + //result.list; + //result.list[0].name; + //result.list[0].displayName; result.list.forEach(function(auth_type, i, arr) { + + var serverAuth = new com.jfoenix.controls.JFXComboBox(); + serverAuth.getStyleClass().add("authOptions"); + (function() { - //profilesList[serverBtn] = profile; - //var hold = serverBtn; - //var hIndex = index; - //serverBtn.setOnAction(function(event) { - // serverHolder.set(hold); - // settings.profile = hIndex; - //}); - authOptions.getItems().add(auth_type.displayName); - })(); + authOptions.getItems().add(auth_type.displayName); + })(); }); overlay.swap(0, processing.overlay, function(event) makeProfilesRequest(function(result) { settings.lastProfiles = result.profiles; @@ -332,7 +328,7 @@ function updateProfilesList(profiles) { serverList.getChildren().clear(); var index = 0; profiles.forEach(function(profile, i, arr) { - pingers[profile] = new ServerPinger(profile.getServerSocketAddress(), profile.getVersion()); + pingers[profile] = new ServerPinger(profile); var serverBtn = new javafx.scene.control.ToggleButton(profile); diff --git a/Launcher/runtime/dialog/images/downloader/line.png b/Launcher/runtime/dialog/images/downloader/line.png index 17339c54..8ff25253 100644 Binary files a/Launcher/runtime/dialog/images/downloader/line.png and b/Launcher/runtime/dialog/images/downloader/line.png differ diff --git a/Launcher/runtime/dialog/overlay/processing/processing.fxml b/Launcher/runtime/dialog/overlay/processing/processing.fxml index 8e40a15c..8d9a0beb 100644 --- a/Launcher/runtime/dialog/overlay/processing/processing.fxml +++ b/Launcher/runtime/dialog/overlay/processing/processing.fxml @@ -7,11 +7,11 @@ - + - diff --git a/Launcher/runtime/dialog/overlay/settings/settings.css b/Launcher/runtime/dialog/overlay/settings/settings.css index 4b6efb50..4cd880f7 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.css +++ b/Launcher/runtime/dialog/overlay/settings/settings.css @@ -21,25 +21,24 @@ #holder #dirChange { /* RAM slider */ #holder > #ramSlider > .track { - -fx-background-color: #D8E0E3; - -fx-background-insets: none; - -fx-background-radius: 2px; - -fx-padding: 2px; + -fx-background-color: #909090; } #holder > #ramSlider > .thumb { - -fx-background-color: #3498DB; - -fx-background-insets: none; - -fx-background-radius: 5px; - -fx-padding: 5px; + -fx-background-color: #5fd97a; } -#holder > #ramSlider:hover > .thumb { - -fx-background-color: #2F8BC8; +#holder > #ramSlider > .colored-track { + -fx-background-color: #5fd97a; } -#holder > #ramSlider:pressed > .thumb { - -fx-background-color: #2876AA; +#holder > #ramSlider > .animated-thumb { + -fx-background-color: #5fd97a; +} + +#holder > #ramSlider > .slider-value { + -fx-fill: white; + -fx-stroke: white; } /* Dir options */ @@ -70,7 +69,7 @@ #holder > #changeDir:pressed { } #holder > #apply,#applyTransfer{ - -fx-background-color: #61B373; + -fx-background-color: #5fd97a; -fx-background-radius: 0; -fx-text-fill: white; -fx-background-position: center; @@ -80,6 +79,6 @@ #holder > #apply,#applyTransfer{ } #holder > #apply:hover,#applyTransfer:hover, #holder > #apply:focused,#applyTransfer:focused{ - -fx-background-color: #74C085; + -fx-background-color: #75e18c; } /*-- DrLeonardo Design --*/ \ No newline at end of file diff --git a/Launcher/runtime/dialog/overlay/settings/settings.fxml b/Launcher/runtime/dialog/overlay/settings/settings.fxml index 902df91e..f4ca9fac 100644 --- a/Launcher/runtime/dialog/overlay/settings/settings.fxml +++ b/Launcher/runtime/dialog/overlay/settings/settings.fxml @@ -13,23 +13,23 @@ - + - + - - - - - - + + + + + + - - - - + + + + Выделение памяти: @@ -43,7 +43,7 @@ - + diff --git a/Launcher/runtime/dialog/overlay/update/update.css b/Launcher/runtime/dialog/overlay/update/update.css index 4bd19e0a..90542c70 100644 --- a/Launcher/runtime/dialog/overlay/update/update.css +++ b/Launcher/runtime/dialog/overlay/update/update.css @@ -4,7 +4,7 @@ #overlay { -fx-background-color: transparent; -fx-background-size: cover; -fx-pref-width: 693px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; -fx-background-image: url('../../images/background.jpg'); } @@ -24,7 +24,7 @@ #overlay > #description.error { .downloadPane { -fx-background-color: rgba(0, 0, 0, 0.3); -fx-pref-width: 693px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; } /* Progress bar */ diff --git a/Launcher/runtime/dialog/overlay/update/update.fxml b/Launcher/runtime/dialog/overlay/update/update.fxml index ebab8ffd..406bdd40 100644 --- a/Launcher/runtime/dialog/overlay/update/update.fxml +++ b/Launcher/runtime/dialog/overlay/update/update.fxml @@ -13,14 +13,14 @@ - diff --git a/Launcher/runtime/dialog/scenes/console/console.fxml b/Launcher/runtime/dialog/scenes/console/console.fxml index e820612b..d7455885 100644 --- a/Launcher/runtime/dialog/scenes/console/console.fxml +++ b/Launcher/runtime/dialog/scenes/console/console.fxml @@ -27,12 +27,12 @@ - + - + @@ -40,8 +40,8 @@ - - + + diff --git a/Launcher/runtime/dialog/scenes/login/login.fxml b/Launcher/runtime/dialog/scenes/login/login.fxml index 338c4655..fe5c2c58 100644 --- a/Launcher/runtime/dialog/scenes/login/login.fxml +++ b/Launcher/runtime/dialog/scenes/login/login.fxml @@ -7,6 +7,7 @@ + @@ -15,19 +16,23 @@ - + - - - - - - + + + + + + + + + + - + @@ -40,9 +45,9 @@ - + - + diff --git a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml index bfbd9238..f124cd17 100644 --- a/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml +++ b/Launcher/runtime/dialog/scenes/mainmenu/mainmenu.fxml @@ -15,11 +15,11 @@ - + - + - + @@ -30,11 +30,11 @@ - + - + - + @@ -44,21 +44,21 @@ - + - + - @@ -84,22 +89,17 @@ - + - + - - - - - - + diff --git a/Launcher/runtime/dialog/scenes/options/options.fxml b/Launcher/runtime/dialog/scenes/options/options.fxml index 41f59941..9bbbdec1 100644 --- a/Launcher/runtime/dialog/scenes/options/options.fxml +++ b/Launcher/runtime/dialog/scenes/options/options.fxml @@ -12,17 +12,17 @@ - + - + - - - + + + - + - + @@ -45,7 +45,7 @@ - + diff --git a/Launcher/runtime/dialog/scenes/options/options.js b/Launcher/runtime/dialog/scenes/options/options.js index 32a6fa28..b5959ff7 100644 --- a/Launcher/runtime/dialog/scenes/options/options.js +++ b/Launcher/runtime/dialog/scenes/options/options.js @@ -110,6 +110,7 @@ var options = { if(modFile.subTreeLevel != null && modFile.subTreeLevel > 1) subLevel = modFile.subTreeLevel; var testMod = new com.jfoenix.controls.JFXCheckBox(modName); + testMod.getStyleClass().add("checkboxOpt"); if(subLevel > 1) for(var i = 1; i < subLevel; i++) @@ -131,6 +132,7 @@ var options = { options.update(); }); checkBoxList.add(testMod); + testMod.getStyleClass().add("modname"); if(modDescription != "") { textDescr = new javafx.scene.text.Text(modDescription); if(subLevel > 1) { diff --git a/Launcher/runtime/dialog/styles.css b/Launcher/runtime/dialog/styles.css index 039bb856..03c7e2cd 100644 --- a/Launcher/runtime/dialog/styles.css +++ b/Launcher/runtime/dialog/styles.css @@ -8,7 +8,7 @@ #layout { -fx-background-color: transparent; -fx-background-size: cover; -fx-pref-width: 738px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; -fx-background-image: url('images/background.jpg'); } #background { @@ -37,7 +37,7 @@ #serverStatus{ #mask { -fx-background-color: rgba(0, 0, 0, 0.5); -fx-pref-width: 692px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; } /** Errors **/ @@ -55,7 +55,7 @@ .error{ #bar { -fx-background-color: #323232; -fx-pref-width: 46px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; } /** buttons in bar **/ #close { @@ -90,7 +90,7 @@ #send:pressed { -fx-background-color: #d8d8d8; } #authPane { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 270px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; } #logo { @@ -106,13 +106,14 @@ .auth { -fx-font-weight: bold; -fx-font-size: 13pt; -fx-background-radius: 0; - -fx-background-color: #61B373; + -fx-background-color: #5fd97a; -fx-text-fill: #ffffff; - -fx-pref-width: 240px; + -fx-pref-width: 200px; -fx-pref-height: 45px; + -fx-effect: dropshadow(gaussian, rgba(23, 25, 29, 0.3), 15,0,0,3); } -.auth:hover, .auth:pressed { -fx-background-color: #74C085; } +.auth:hover, .auth:pressed { -fx-background-color: #75e18c; } #password, #login { -fx-background-radius: 0; @@ -152,49 +153,93 @@ #rememberchb{ } #combologin { -fx-text-fill: #909090; + -fx-prompt-text-fill: #909090; -fx-pref-width: 200px; -fx-pref-height: 30px; } +.combologin, +.combologin { + -fx-font-size: 13px; + -fx-prompt-text-fill: #909090; + -fx-text-fill: #909090; + -fx-background-color: transparent; +} + +.combologin .list-cell { + -fx-background: white; + -fx-background-color: transparent; + -fx-text-fill: -fx-text-base-color; +} + +.combologin-popup .list-view { + -fx-background-color: white, white; + -fx-background-insets: 0, 1; + -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.6) , 8, 0.0 , 0 , 0 ); +} + +.combologin .list-cell:filled:selected .text, +.combologin .list-cell:filled:selected .text { + -fx-fill: #909090; +} + +.combologin .arrow, +.combologin .arrow { + -fx-background-color: #5fd97a; +} + +.combologin-popup .list-view .list-cell +{ + -fx-background-color: white; +} + +.combologin-popup .list-view .list-cell:filled:selected, .combologin-popup .list-view .list-cell:filled:selected:hover +{ + -fx-background: -fx-accent; + -fx-background-color: -fx-selection-bar; + -fx-text-fill: -fx-selection-bar-text; +} + +.combologin-popup .list-view .list-cell:filled:hover +{ + -fx-background-color: white; + -fx-text-fill: -fx-text-inner-color; +} /** web**/ #news { -fx-background-color: transparent; -fx-pref-width: 423px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; } /* MenuPane */ .serverentrance { -fx-background-color: rgba(255, 255, 255, 0.71); -fx-pref-width: 386px; - -fx-pref-height: 425px; + -fx-pref-height: 450px; } /** buttons **/ .clientLaunch{ -jfx-button-type: FLAT; -fx-font-weight: bold; - -fx-font-size: 18pt; + -fx-font-size: 16pt; -fx-background-radius: 0; - -fx-background-color: #61B373; + -fx-background-color: #5fd97a; -fx-text-fill: #ffffff; - -fx-pref-width: 260px; - -fx-pref-height: 45px; } .clientSettings{ -fx-background-position: center; -jfx-button-type: FLAT; - -fx-background-color: #61B373; + -fx-background-color: #5fd97a; -fx-background-radius: 0; - -fx-pref-width: 85px; - -fx-pref-height: 51px; } -.clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #74C085; } +.clientLaunch:hover, .clientLaunch:pressed { -fx-background-color: #75e18c; } /* Pressets options */ .pressetLight, .pressetMedium, .pressetHigh { - -jfx-toggle-color: #61B373; + -jfx-toggle-color: #5fd97a; -jfx-untoggle-color: #FAFAFA; -jfx-toggle-line-color: rgba(116, 192, 133, 0.79); -jfx-untoggle-line-color: #999999; @@ -243,7 +288,6 @@ .scroll-pane>.corner { /* OptionsPane */ #optionsPane > #modlist { -fx-background-color: transparent; - } #optionsPane > #modlist > .viewport { @@ -256,9 +300,18 @@ .description-text { -fx-font-size: 12px; } +.checkboxOpt { + -jfx-checked-color: #5fd97a; + -jfx-unchecked-color: #909090; +} + +.modname { + -fx-text-fill: #323232; +} + .lineHead { -fx-stroke: #d8d8d8; - -fx-stroke-width: 10; + -fx-stroke-width: 1; } .separator *.line { diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java b/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java index 6052e4eb..69928887 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java @@ -76,9 +76,9 @@ private static void writeUTF16String(HOutput output, String s) throws IOExceptio private Instant cacheTime = null; @LauncherAPI - public ServerPinger(InetSocketAddress address, ClientProfile.Version version) { - this.address = Objects.requireNonNull(address, "address"); - this.version = Objects.requireNonNull(version, "version"); + public ServerPinger(ClientProfile profile) { + this.address = Objects.requireNonNull(profile.getServerSocketAddress(), "address"); + this.version = Objects.requireNonNull(profile.getVersion(), "version"); } private Result doPing() throws IOException { diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java index 194e685f..87ef489c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java @@ -15,10 +15,12 @@ public static void initGuard(boolean clientInstance) { case "wrapper": { guard = new LauncherWrapperGuard(); + break; } case "java": { guard = new LauncherJavaGuard(); + break; } default: { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java index 22e0c07d..0e90de8f 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java @@ -27,6 +27,8 @@ public abstract class ClientJSONPoint { private static final EventLoopGroup group = new NioEventLoopGroup(); protected WebSocketClientHandler webSocketClientHandler; protected Bootstrap bootstrap = new Bootstrap(); + protected boolean ssl = false; + protected int port = -1; public boolean isClosed; public ClientJSONPoint(final String uri) throws SSLException { @@ -39,11 +41,16 @@ public ClientJSONPoint(URI uri) throws SSLException { if (!"ws".equals(protocol) && !"wss".equals(protocol)) { throw new IllegalArgumentException("Unsupported protocol: " + protocol); } - boolean ssl = false; if("wss".equals(protocol)) { ssl = true; } + if(uri.getPort() == -1) + { + if("ws".equals(protocol)) port = 80; + else port = 443; + } + else port = uri.getPort(); final SslContext sslCtx; if (ssl) { sslCtx = SslContextBuilder.forClient().build(); @@ -55,7 +62,7 @@ public ClientJSONPoint(URI uri) throws SSLException { public void initChannel(SocketChannel ch) throws Exception { ChannelPipeline pipeline = ch.pipeline(); if (sslCtx != null) { - pipeline.addLast(sslCtx.newHandler(ch.alloc())); + pipeline.addLast(sslCtx.newHandler(ch.alloc(), uri.getHost(), port)); } pipeline.addLast("http-codec", new HttpClientCodec()); pipeline.addLast("aggregator", new HttpObjectAggregator(65536)); @@ -70,7 +77,7 @@ public void open() throws Exception { new WebSocketClientHandler( WebSocketClientHandshakerFactory.newHandshaker( uri, WebSocketVersion.V13, null, false, EmptyHttpHeaders.INSTANCE, 1280000), this); - ch = bootstrap.connect(uri.getHost(), uri.getPort()).sync().channel(); + ch = bootstrap.connect(uri.getHost(), port).sync().channel(); webSocketClientHandler.handshakeFuture().sync(); } public ChannelFuture send(String text) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 457aad0d..5c2d1cf0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee671127..ee69dd68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708ff..b0d6d0ab 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc7..9991c503 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem http://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome diff --git a/libLauncher/src/main/java/ru/gravit/utils/Version.java b/libLauncher/src/main/java/ru/gravit/utils/Version.java index e9deb102..ade6065a 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/Version.java +++ b/libLauncher/src/main/java/ru/gravit/utils/Version.java @@ -18,7 +18,7 @@ public final class Version { public static final int MAJOR = 5; public static final int MINOR = 0; public static final int PATCH = 0; - public static final int BUILD = 5; + public static final int BUILD = 6; public static final Version.Type RELEASE = Version.Type.BETA; @LauncherAPI diff --git a/libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java b/libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java index f5c144df..99d4c5c4 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java +++ b/libLauncher/src/main/java/ru/gravit/utils/helper/JarHelper.java @@ -9,12 +9,12 @@ public class JarHelper { @FunctionalInterface - interface ZipWalkCallback + public interface ZipWalkCallback { void process(ZipInputStream input, ZipEntry e); } @FunctionalInterface - interface JarWalkCallback + public interface JarWalkCallback { void process(ZipInputStream input, ZipEntry e, String fullClassName, String clazz); }