Update development #5

Merge aplicado
Awakened-Redstone mesclou 27 commits from temp into development 2022-02-18 19:01:36 +00:00
6 arquivos alterados com 7 adições e 7 exclusões
Mostrando apenas as alterações do commit 0a4cedc853 - Mostrar todos os commits

Merge branch 'development' into temp

Awakened-Redstone 2022-02-18 16:00:58 -03:00 commit de GitHub
Nenhuma chave conhecida encontrada para esta assinatura no banco de dados
ID da chave GPG: 4AEE18F83AFDEB23

Ver arquivo

@ -1,4 +1,4 @@
![](https://ci.codemc.io/job/Awakened-Redstone/job/AutoWhitelist/badge/icon?subject=Build%20Status) ![](https://ci.codemc.io/job/Awakened-Redstone/job/AutoWhitelist/badge/icon?subject=Build%20Status)
# AutoWhitelist # AutoWhitelist
More information at: https://modrinth.com/mod/autowhitelist More information at: https://modrinth.com/mod/autowhitelist
Beta builds: https://ci.codemc.io/job/Awakened-Redstone/job/AutoWhitelist/ Beta builds: https://ci.codemc.io/job/Awakened-Redstone/job/AutoWhitelist/

Ver arquivo

@ -76,4 +76,4 @@ tasks.withType(JavaCompile) {
jar { jar {
from "LICENSE" from "LICENSE"
} }

Ver arquivo

@ -6,4 +6,4 @@ mod_version=beta-5.0.1
maven_group=com.awakenedredstone maven_group=com.awakenedredstone
archives_base_name=autowhitelist archives_base_name=autowhitelist
fabric_version=0.46.2+1.18 fabric_version=0.46.2+1.18

Ver arquivo

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

Ver arquivo

@ -29,7 +29,7 @@ public class Config {
String json = reader.lines().collect(Collectors.joining("\n")); String json = reader.lines().collect(Collectors.joining("\n"));
StringReader stringReader = new StringReader(json); StringReader stringReader = new StringReader(json);
JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject(); JsonObject jsonObject = JsonParser.parseString(json).getAsJsonObject();
if (jsonObject.get("version") == null || jsonObject.get("version").getAsFloat() != configVersion) { if (jsonObject.get("version") == null || jsonObject.get("version").getAsFloat() != configVersion) {
jsonObject.add("owners", new JsonArray()); jsonObject.add("owners", new JsonArray());

Ver arquivo

@ -88,7 +88,7 @@ public class Bot implements Runnable {
} catch (LoginException e) { } catch (LoginException e) {
AutoWhitelist.LOGGER.error("Failed to start bot, please verify the token."); AutoWhitelist.LOGGER.error("Failed to start bot, please verify the token.");
} catch (Exception e) { } catch (Exception e) {
AutoWhitelist.LOG4J_LOGGER.error(e); AutoWhitelist.LOG4J_LOGGER.error(e);
} }
} }
} }