From f19aa412054e6bf19cb1f5a1ceb419796be5eba3 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 15 Feb 2020 00:23:04 +0100 Subject: [PATCH] Configure CI build for GitHub Packages Also fixed a couple issues based on an analysis Removed debug souts --- .gitignore | 445 +++++++++--------- .idea/ButtonChat.iml | 130 ----- .travis.yml | 1 + Mvn.txt | 1 - ci/settings.xml | 36 ++ deploy.sh | 10 - .../chatonly/ChatOnlyComponent.java | 3 +- .../components/flair/SetFlairCommand.java | 2 +- .../formatter/formatting/ChatFormatUtils.java | 4 - .../formatting/FormattedSection.java | 2 +- .../formatting/RangeMatchProvider.java | 1 - .../formatter/formatting/TellrawEvent.java | 2 +- .../formatting/TellrawSerializer.java | 1 + .../towncolors/TownColorCommand.java | 14 - src/main/resources/plugin.yml | 2 +- .../buttondevteam/chat/ObjectTestRunner.java | 24 +- .../components/formatter/ChatFormatIT.java | 2 +- 17 files changed, 276 insertions(+), 404 deletions(-) delete mode 100644 .idea/ButtonChat.iml delete mode 100644 Mvn.txt create mode 100644 ci/settings.xml delete mode 100644 deploy.sh diff --git a/.gitignore b/.gitignore index 456756d..a84274b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,224 +1,221 @@ -################# -## Eclipse -################# - -*.pydevproject -.metadata/ -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.classpath -.settings/ -.loadpath -target/ -.project - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# PDT-specific -.buildpath - - -################# -## Visual Studio -################# - -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.sln.docstates - -# Build results - -[Dd]ebug/ -[Rr]elease/ -x64/ -build/ -[Bb]in/ -[Oo]bj/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -*_i.c -*_p.c -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.log -*.scc - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -*.ncrunch* -.*crunch*.local.xml - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.Publish.xml -*.pubxml -*.publishproj - -# NuGet Packages Directory -## TO!DO: If you have NuGet Package Restore enabled, uncomment the next line -#packages/ - -# Windows Azure Build Output -csx -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Others -sql/ -*.Cache -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.[Pp]ublish.xml -*.pfx -*.publishsettings - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -App_Data/*.mdf -App_Data/*.ldf - -############# -## Windows detritus -############# - -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Mac crap -.DS_Store - - -############# -## Python -############# - -*.py[cod] - -# Packages -*.egg -*.egg-info -dist/ -build/ -eggs/ -parts/ -var/ -sdist/ -develop-eggs/ -.installed.cfg - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox - -#Translations -*.mo - -#Mr Developer -.mr.developer.cfg -.metadata/* -TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar -#*.iml -*.name -.idea/compiler.xml -*.xml -/.apt_generated/ +################# +## Eclipse +################# + +*.pydevproject +.metadata/ +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.classpath +.settings/ +.loadpath +target/ +.project + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + + +################# +## Visual Studio +################# + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.sln.docstates + +# Build results + +[Dd]ebug/ +[Rr]elease/ +x64/ +build/ +[Bb]in/ +[Oo]bj/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +*_i.c +*_p.c +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.scc + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +*.ncrunch* +.*crunch*.local.xml + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.Publish.xml +*.pubxml +*.publishproj + +# NuGet Packages Directory +## TO!DO: If you have NuGet Package Restore enabled, uncomment the next line +#packages/ + +# Windows Azure Build Output +csx +*.build.csdef + +# Windows Store app package directory +AppPackages/ + +# Others +sql/ +*.Cache +ClientBin/ +[Ss]tyle[Cc]op.* +~$* +*~ +*.dbmdl +*.[Pp]ublish.xml +*.pfx +*.publishsettings + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file to a newer +# Visual Studio version. Backup files are not needed, because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +App_Data/*.mdf +App_Data/*.ldf + +############# +## Windows detritus +############# + +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Mac crap +.DS_Store + + +############# +## Python +############# + +*.py[cod] + +# Packages +*.egg +*.egg-info +dist/ +eggs/ +parts/ +var/ +sdist/ +develop-eggs/ +.installed.cfg + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox + +#Translations +*.mo + +#Mr Developer +.mr.developer.cfg +.metadata/* +TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar +*.iml +*.name +.idea/compiler.xml +*.xml +/.apt_generated/ diff --git a/.idea/ButtonChat.iml b/.idea/ButtonChat.iml deleted file mode 100644 index a340893..0000000 --- a/.idea/ButtonChat.iml +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index f241e78..a3dfe4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ before_install: | # Wget BuildTools and run if cached folder not found # grep so that download counts don't appear in log files java -jar BuildTools.jar --rev 1.12.2 | grep -vE "[^/ ]*/[^/ ]*\s*KB\s*$" | grep -v "^\s*$" fi + cp ci/settings.xml $HOME/.m2/ language: java jdk: - oraclejdk8 diff --git a/Mvn.txt b/Mvn.txt deleted file mode 100644 index 8e9f41f..0000000 --- a/Mvn.txt +++ /dev/null @@ -1 +0,0 @@ -apache-maven-3.2.5/bin/mvn install:install-file -Dfile=Towny.jar -DgroupId=com.palmergames -DartifactId=Towny -Dversion=0.90.0.0 -Dpackaging=jar diff --git a/ci/settings.xml b/ci/settings.xml new file mode 100644 index 0000000..a0cab53 --- /dev/null +++ b/ci/settings.xml @@ -0,0 +1,36 @@ + + + + github + + + + + github + + + + github + GitHub Towny Apache Maven Packages + https://maven.pkg.github.com/TownyAdvanced/Towny + + + + + + + + github + NorbiPeti + ${env.GHTOKEN} + + + diff --git a/deploy.sh b/deploy.sh deleted file mode 100644 index 82c8e92..0000000 --- a/deploy.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -FILENAME=$(find target/ -maxdepth 1 ! -name '*original*' -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 diff --git a/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java b/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java index 2aca8df..f67c888 100644 --- a/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java +++ b/src/main/java/buttondevteam/chat/components/chatonly/ChatOnlyComponent.java @@ -1,6 +1,7 @@ package buttondevteam.chat.components.chatonly; import buttondevteam.chat.ChatPlayer; +import buttondevteam.chat.PluginMain; import buttondevteam.chat.components.formatter.formatting.TellrawEvent; import buttondevteam.chat.components.formatter.formatting.TellrawPart; import buttondevteam.core.ComponentManager; @@ -20,7 +21,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; * Allows players to enter chat-only mode which puts them into spectator mode and disallows everything besides chatting. */ @ComponentMetadata(enabledByDefault = false) -public class ChatOnlyComponent extends Component implements Listener { +public class ChatOnlyComponent extends Component implements Listener { @Override protected void enable() { registerListener(this); diff --git a/src/main/java/buttondevteam/chat/components/flair/SetFlairCommand.java b/src/main/java/buttondevteam/chat/components/flair/SetFlairCommand.java index 36d9275..575d57f 100644 --- a/src/main/java/buttondevteam/chat/components/flair/SetFlairCommand.java +++ b/src/main/java/buttondevteam/chat/components/flair/SetFlairCommand.java @@ -23,7 +23,7 @@ public class SetFlairCommand extends AdminCommandBase { sender.sendMessage("§cPlayer not found.&r"); return true; } - short ft = 0x00; + short ft; if (flairtime.equalsIgnoreCase("non-presser")) ft = ChatPlayer.FlairTimeNonPresser; else if (flairtime.equalsIgnoreCase("cant-press")) diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatUtils.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatUtils.java index 20d2083..e9f41d2 100644 --- a/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatUtils.java +++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/ChatFormatUtils.java @@ -4,7 +4,6 @@ import buttondevteam.chat.commands.ucmds.admin.DebugCommand; import java.util.ArrayList; import java.util.Arrays; -import java.util.stream.Collectors; public final class ChatFormatUtils { private ChatFormatUtils() {} @@ -27,9 +26,6 @@ public final class ChatFormatUtils { * Check if the given start and end position is inside any of the ranges */ static boolean isInRange(int start, int end, ArrayList ranges) { - System.out.println("Ranges: " + ranges.stream().map(x -> x[0] + "-" + x[1]).collect(Collectors.joining(", "))); - System.out.println("In range: " + start + " " + end + ": " + - ranges.stream().filter(range -> range[1] >= start && range[0] <= end).map(x -> x[0] + "-" + x[1]).findAny().orElse("none")); return ranges.stream().anyMatch(range -> range[1] >= start && range[0] <= end); } } diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/FormattedSection.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/FormattedSection.java index f1b0de1..eab4575 100644 --- a/src/main/java/buttondevteam/chat/components/formatter/formatting/FormattedSection.java +++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/FormattedSection.java @@ -10,7 +10,7 @@ public class FormattedSection { public int Start; public int End; public FormatSettings Settings; - public List Matches = new ArrayList(); + public List Matches = new ArrayList<>(); FormattedSection(FormatSettings settings, int start, int end, List matches) { Start = start; diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/RangeMatchProvider.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/RangeMatchProvider.java index ec94e83..aa872cb 100644 --- a/src/main/java/buttondevteam/chat/components/formatter/formatting/RangeMatchProvider.java +++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/RangeMatchProvider.java @@ -19,7 +19,6 @@ public class RangeMatchProvider extends MatchProviderBase { this.settings = settings; } - @SuppressWarnings("DuplicatedCode") @Override public FormattedSection getNextSection(String message, ArrayList ignoredAreas, ArrayList removedCharacters) { int i, len; diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java index 4c532e5..53fe988 100644 --- a/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java +++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawEvent.java @@ -71,6 +71,6 @@ public final class TellrawEvent implements Serial } } - public static interface Action extends TellrawSerializableEnum { + public interface Action extends TellrawSerializableEnum { } } diff --git a/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawSerializer.java b/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawSerializer.java index b1a36fd..4f9c450 100644 --- a/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawSerializer.java +++ b/src/main/java/buttondevteam/chat/components/formatter/formatting/TellrawSerializer.java @@ -48,6 +48,7 @@ public abstract class TellrawSerializer { throw new UnsupportedOperationException(); } + @SuppressWarnings("ConstantConditions") @Override public void write(JsonWriter writer, Boolean val) throws IOException { if (val) diff --git a/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java b/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java index 0bfdcd6..8dd911c 100644 --- a/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java +++ b/src/main/java/buttondevteam/chat/components/towncolors/TownColorCommand.java @@ -12,8 +12,6 @@ import lombok.RequiredArgsConstructor; import lombok.val; import org.bukkit.entity.Player; -import java.lang.reflect.Method; - @CommandClass(helpText = { "Town Color", // "This command allows setting a color for a town.", // @@ -23,18 +21,6 @@ import java.lang.reflect.Method; @RequiredArgsConstructor public class TownColorCommand extends UCommandBase { private final TownColorComponent component; - @Override - public String[] getHelpText(Method method, Command2.Subcommand ann) { - StringBuilder cns = new StringBuilder(" "); - for (int i = 2; i <= component.colorCount().get(); i++) - cns.append(" [colorname").append(i).append("]"); - return new String[] { // - "§6---- Town Color ----", // - "This command allows setting color(s) for a town.", // - "The town will be shown with this color on Dynmap and all players in the town will appear in chat with these colors.", // - "The colors will split the name evenly.", // - }; - } @Command2.Subcommand public boolean def(Player player, String... colornames) { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 20f270a..5eefc33 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: Chroma-Chat main: buttondevteam.chat.PluginMain -version: 4.0 +version: '4.0' commands: u: description: Auto-flair system. Accept or ignore flair. diff --git a/src/test/java/buttondevteam/chat/ObjectTestRunner.java b/src/test/java/buttondevteam/chat/ObjectTestRunner.java index 25785ee..1b5a034 100644 --- a/src/test/java/buttondevteam/chat/ObjectTestRunner.java +++ b/src/test/java/buttondevteam/chat/ObjectTestRunner.java @@ -1,15 +1,5 @@ package buttondevteam.chat; -import java.lang.annotation.Annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.junit.runner.Runner; import org.junit.runner.notification.RunNotifier; import org.junit.runners.BlockJUnit4ClassRunner; @@ -20,6 +10,12 @@ import org.junit.runners.model.InitializationError; import org.junit.runners.model.Statement; import org.junit.runners.model.TestClass; +import java.lang.annotation.*; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * Based on {@link Parameterized} * @@ -32,10 +28,10 @@ public class ObjectTestRunner extends Suite { */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) - public static @interface Objects { + public @interface Objects { } - private class TestClassRunnerForObjects extends BlockJUnit4ClassRunner { + private static class TestClassRunnerForObjects extends BlockJUnit4ClassRunner { private List objectList; private int fParameterSetNumber; @@ -77,13 +73,13 @@ public class ObjectTestRunner extends Suite { } } - private final ArrayList runners = new ArrayList(); + private final ArrayList runners = new ArrayList<>(); /** * Only called reflectively. Do not use programmatically. */ public ObjectTestRunner(Class klass) throws Throwable { - super(klass, Collections.emptyList()); + super(klass, Collections.emptyList()); List objectsList = getObjectsList(getTestClass()); for (int i = 0; i < objectsList.size(); i++) runners.add(new TestClassRunnerForObjects(getTestClass().getJavaClass(), objectsList, i)); diff --git a/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java b/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java index d54aa5a..7d2d250 100644 --- a/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java +++ b/src/test/java/buttondevteam/chat/components/formatter/ChatFormatIT.java @@ -30,7 +30,7 @@ public class ChatFormatIT { DebugCommand.DebugMode = true; PluginMain.permission = Mockito.mock(Permission.class); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new ChatFormatIT(sender, "*test*", new TellrawPart("test").setItalic(true).setColor(Color.White))); list.add(new ChatFormatIT(sender, "**test**", new TellrawPart("test").setBold(true).setColor(Color.White)));