From 8f6ee349de509fd316c3d0c5e050c0634b0776f8 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Mon, 10 Feb 2020 12:47:00 +0100 Subject: [PATCH] Fix and use GitHub Releases #76 --- .travis.yml | 15 ++++-------- ButtonCore/.factorypath | 2 -- ButtonCore/.project | 23 ------------------- .../org.eclipse.core.resources.prefs | 6 ----- .../.settings/org.eclipse.jdt.apt.core.prefs | 4 ---- .../.settings/org.eclipse.jdt.core.prefs | 14 ----------- .../.settings/org.eclipse.m2e.core.prefs | 4 ---- ButtonCore/Chroma-Core.iml | 15 ------------ .../component/members/MemberComponent.java | 2 +- deploy.sh | 10 -------- 10 files changed, 6 insertions(+), 89 deletions(-) delete mode 100755 ButtonCore/.factorypath delete mode 100755 ButtonCore/.project delete mode 100755 ButtonCore/.settings/org.eclipse.core.resources.prefs delete mode 100755 ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs delete mode 100755 ButtonCore/.settings/org.eclipse.jdt.core.prefs delete mode 100755 ButtonCore/.settings/org.eclipse.m2e.core.prefs delete mode 100644 ButtonCore/Chroma-Core.iml delete mode 100755 deploy.sh diff --git a/.travis.yml b/.travis.yml index 7a60b95..9c411a2 100755 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,10 @@ jdk: - oraclejdk11 sudo: true deploy: - # deploy develop to the staging environment - - provider: script - script: chmod +x deploy.sh && sh deploy.sh staging + - provider: releases + api_key: + secure: "T/ITeRn4JSx4HS4n44P7vy03HWmJGVpYeR6tABu8qOLrwz2MUCFu8xvYqoq4MiqIKqFIKtZHgCSWiB1WsTIJPHm9S2xYs0BFocoQDthE+eCtT2wgCHj/xdo0wBm8uktXr2hxRF5Nd2R/mfSLkoVxAM6otOoSa1SidRGKgDCJxRnsgssk5igQR+tpahZYPvuzM5xJ4G6J07cC+HHM7RLYXkkKrsK3LFugTsnNtctwmxQkm6SqzDcc8YPwoJGhj8PLbXc5S8/KaWT0//LNdypnzeIaRv+aY+ky/zLntXlw3EFOk4erTthAEMSu2x6PgX5B/paMawdwnqKul/L4ynMGojrLH8ha9KM7p/lze2bxCaf08RFVFvTQt6yzmvM1suL4KH6gAF4mKhyaU0kBeOsnTTskoxyGxvbZgdo0Y1V+Yd7w58eu8zfxnauaX7f2DEz7gH4qkSl+hC7HAFoY7m7IXkgVN6Vuv3lGdFO5S15lbGoihOPqt9T79lBxi/efiXEE4BmA1g8MeLsyN8N/EO+LqVr6xXAKJet6YtOAe/iIAqxpNDSuME1szusc6+4q3jOy6cPmB1TKsfnIKQmbT98SHc9wE4/76VLd2PlNPppa0AIG/g+qnjhjpFQxB7LnWdP+D6io9N1FYrvoOX8UVAp4XYhwUMNLUInDT/6P6j8lL7A=" + file: 'Chroma-Core/target/Chroma-Core.jar' on: - branch: dev - skip_cleanup: true - # deploy master to production - - provider: script - script: chmod +x deploy.sh && sh deploy.sh production - on: - branch: master + tags: true skip_cleanup: true diff --git a/ButtonCore/.factorypath b/ButtonCore/.factorypath deleted file mode 100755 index 610dea5..0000000 --- a/ButtonCore/.factorypath +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/ButtonCore/.project b/ButtonCore/.project deleted file mode 100755 index 602cd30..0000000 --- a/ButtonCore/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - ButtonCore - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - org.eclipse.jdt.core.javanature - - diff --git a/ButtonCore/.settings/org.eclipse.core.resources.prefs b/ButtonCore/.settings/org.eclipse.core.resources.prefs deleted file mode 100755 index ed7df2b..0000000 --- a/ButtonCore/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 -encoding/src=UTF-8 diff --git a/ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs b/ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs deleted file mode 100755 index 7d52ece..0000000 --- a/ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.apt.aptEnabled=true -org.eclipse.jdt.apt.genSrcDir=.apt_generated -org.eclipse.jdt.apt.reconcileEnabled=true diff --git a/ButtonCore/.settings/org.eclipse.jdt.core.prefs b/ButtonCore/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index edf183d..0000000 --- a/ButtonCore/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,14 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.processAnnotations=enabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/ButtonCore/.settings/org.eclipse.m2e.core.prefs b/ButtonCore/.settings/org.eclipse.m2e.core.prefs deleted file mode 100755 index 14b697b..0000000 --- a/ButtonCore/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/ButtonCore/Chroma-Core.iml b/ButtonCore/Chroma-Core.iml deleted file mode 100644 index 8d8ffd9..0000000 --- a/ButtonCore/Chroma-Core.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java b/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java index 9ebb00f..d003526 100644 --- a/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java +++ b/Chroma-Core/src/main/java/buttondevteam/core/component/members/MemberComponent.java @@ -85,7 +85,7 @@ public class MemberComponent extends Component implements Listener { } public boolean checkPlayTime(Player player) { - return player.getStatistic(playtime.getKey()) > playtime.getValue() * playedHours().get()); + return player.getStatistic(playtime.getKey()) > playtime.getValue() * playedHours().get(); } public long getRegTime(Player player) { diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index 000296a..0000000 --- a/deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -FILENAME=$(find ButtonCore/target/ -maxdepth 1 ! -name '*original*' ! -name '*sources*' -name '*.jar') -echo Found file: $FILENAME - -if [ $1 = 'production' ]; then -echo Production mode -echo $UPLOAD_KEY > upload_key -chmod 400 upload_key -yes | scp -B -i upload_key -o StrictHostKeyChecking=no $FILENAME travis@server.figytuna.com:/minecraft/main/TBMC/pluginupdates -fi