diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000..3a37288 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,9 @@ +--- +# List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/ +tasks: + - init: sh ./coauthors.sh +vscode: + extensions: + - redhat.java + - mhutchie.git-graph + - vscjava.vscode-maven \ No newline at end of file diff --git a/LLSIG/.gitignore b/LLSIG/.gitignore index e9fff3b..9c0064d 100644 --- a/LLSIG/.gitignore +++ b/LLSIG/.gitignore @@ -1,2 +1,3 @@ /bin/ /music/ +/target/ diff --git a/LLSIG/.project b/LLSIG/.project index ec43181..df16101 100644 --- a/LLSIG/.project +++ b/LLSIG/.project @@ -14,4 +14,15 @@ org.eclipse.jdt.core.javanature + + + 1633501545997 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/LLSIG/LLSIG.jar b/LLSIG/LLSIG.jar new file mode 100644 index 0000000..2c5dfab Binary files /dev/null and b/LLSIG/LLSIG.jar differ diff --git a/LLSIG/coauthors.sh b/LLSIG/coauthors.sh new file mode 100755 index 0000000..e97524b --- /dev/null +++ b/LLSIG/coauthors.sh @@ -0,0 +1,40 @@ +npm i -g git-mob +cat <<-EOF > ~/.git-coauthors +{ + "coauthors": { + "sig": { + "name": "sigonasr2", + "email": "sigonasr2@gmail.com" + } + } +} +EOF +git mob sig +cat <<-EOF > .git/hooks/prepare-commit-msg +#!/usr/bin/env node +let exec = require('child_process').exec, + fs = require('fs'); +const commitMessage = process.argv[2]; +// expect .git/COMMIT_EDITMSG +if(/COMMIT_EDITMSG/g.test(commitMessage)){ + let contents = ""; + exec("git mob-print", + function (err, stdout) { + if(err) { + process.exit(0); + } + // opens .git/COMMIT_EDITMSG + contents = fs.readFileSync(commitMessage); + if(contents.indexOf(stdout.trim()) !== -1) { + process.exit(0); + } + const commentPos = contents.indexOf('# '); + const gitMessage = contents.slice(0, commentPos); + const gitComments = contents.slice(commentPos) + fs.writeFileSync(commitMessage, gitMessage + stdout + gitComments); + process.exit(0); + }); +} +EOF +chmod +x .git/hooks/prepare-commit-msg +echo "Environment is setup!" \ No newline at end of file diff --git a/LLSIG/pom.xml b/LLSIG/pom.xml new file mode 100644 index 0000000..2e8dd0e --- /dev/null +++ b/LLSIG/pom.xml @@ -0,0 +1,103 @@ + + + + 4.0.0 + + LLSIG + LLSIG + 1.0-SNAPSHOT + + LLSIG + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + javazoom + jlayer + 1.0.1 + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + maven-assembly-plugin + + + + main.java.LLSIG.LLSIG + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + + diff --git a/LLSIG/run b/LLSIG/run new file mode 100755 index 0000000..362fb8e --- /dev/null +++ b/LLSIG/run @@ -0,0 +1,2 @@ +mvn compile assembly:single +java -jar target/LLSIG-1.0-SNAPSHOT-jar-with-dependencies.jar \ No newline at end of file diff --git a/LLSIG/src/main/java/LLSIG/App.java b/LLSIG/src/main/java/LLSIG/App.java new file mode 100644 index 0000000..16d641f --- /dev/null +++ b/LLSIG/src/main/java/LLSIG/App.java @@ -0,0 +1,13 @@ +package main.java.LLSIG; + +/** + * Hello world! + * + */ +public class App +{ + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + } +} diff --git a/LLSIG/src/Canvas.java b/LLSIG/src/main/java/LLSIG/Canvas.java similarity index 78% rename from LLSIG/src/Canvas.java rename to LLSIG/src/main/java/LLSIG/Canvas.java index 8509b36..a828f73 100644 --- a/LLSIG/src/Canvas.java +++ b/LLSIG/src/main/java/LLSIG/Canvas.java @@ -1,3 +1,4 @@ +package main.java.LLSIG; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics; @@ -15,7 +16,8 @@ public class Canvas extends JPanel{ public void paintComponent(Graphics g) { final int MIDDLE_X = this.getWidth()/2; - final int MIDDLE_Y = this.getHeight()/2; + final int MIDDLE_Y = this.getHeight()/8; + final int NOTE_DISTANCE = 128; final int JUDGEMENT_LINE_WIDTH = 64; final int JUDGEMENT_LINE_HEIGHT = 4; final int NOTE_SIZE = 16; @@ -32,7 +34,8 @@ public class Canvas extends JPanel{ int LANE_X_OFFSET = (i-5)*LANE_SPACING_X+LANE_SPACING_X/2+JUDGEMENT_LINE_WIDTH/2; g.setColor(Color.GRAY); - g.fillRect(MIDDLE_X-JUDGEMENT_LINE_WIDTH/2+LANE_X_OFFSET,MIDDLE_Y-JUDGEMENT_LINE_HEIGHT/2,JUDGEMENT_LINE_WIDTH,JUDGEMENT_LINE_HEIGHT); + //g.fillRect(MIDDLE_X-JUDGEMENT_LINE_WIDTH/2+LANE_X_OFFSET,MIDDLE_Y-JUDGEMENT_LINE_HEIGHT/2,JUDGEMENT_LINE_WIDTH,JUDGEMENT_LINE_HEIGHT); + g.fillOval((int)(MIDDLE_X-Math.cos(Math.toRadians(22.5*i))-16),(int)(MIDDLE_Y+Math.sin(Math.toRadians(22.5*i))-16),32,32); g.setColor(NOTE_COLOR); Lane lane = LLSIG.game.lanes.get(i); diff --git a/LLSIG/src/JLayerPlayerPausable.java b/LLSIG/src/main/java/LLSIG/JLayerPlayerPausable.java similarity index 99% rename from LLSIG/src/JLayerPlayerPausable.java rename to LLSIG/src/main/java/LLSIG/JLayerPlayerPausable.java index f84cb4c..9d2eb01 100644 --- a/LLSIG/src/JLayerPlayerPausable.java +++ b/LLSIG/src/main/java/LLSIG/JLayerPlayerPausable.java @@ -1,3 +1,4 @@ +package main.java.LLSIG; /* *----------------------------------------------------------------------- * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as published diff --git a/LLSIG/src/LLSIG.java b/LLSIG/src/main/java/LLSIG/LLSIG.java similarity index 98% rename from LLSIG/src/LLSIG.java rename to LLSIG/src/main/java/LLSIG/LLSIG.java index 5c8f44f..690e7a2 100644 --- a/LLSIG/src/LLSIG.java +++ b/LLSIG/src/main/java/LLSIG/LLSIG.java @@ -1,3 +1,4 @@ +package main.java.LLSIG; import java.awt.Dimension; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; @@ -15,7 +16,7 @@ import java.util.regex.Pattern; import javax.swing.JFrame; import javazoom.jl.decoder.JavaLayerException; -import sig.utils.FileUtils; +import main.java.sig.utils.FileUtils; public class LLSIG implements KeyListener{ Player musicPlayer; diff --git a/LLSIG/src/Lane.java b/LLSIG/src/main/java/LLSIG/Lane.java similarity index 97% rename from LLSIG/src/Lane.java rename to LLSIG/src/main/java/LLSIG/Lane.java index d3f1b0d..fbb9516 100644 --- a/LLSIG/src/Lane.java +++ b/LLSIG/src/main/java/LLSIG/Lane.java @@ -1,3 +1,4 @@ +package main.java.LLSIG; import java.util.ArrayList; import java.util.List; diff --git a/LLSIG/src/Note.java b/LLSIG/src/main/java/LLSIG/Note.java similarity index 96% rename from LLSIG/src/Note.java rename to LLSIG/src/main/java/LLSIG/Note.java index 4b20fd2..a9b15a2 100644 --- a/LLSIG/src/Note.java +++ b/LLSIG/src/main/java/LLSIG/Note.java @@ -1,3 +1,4 @@ +package main.java.LLSIG; public class Note { NoteType type; diff --git a/LLSIG/src/NoteType.java b/LLSIG/src/main/java/LLSIG/NoteType.java similarity index 62% rename from LLSIG/src/NoteType.java rename to LLSIG/src/main/java/LLSIG/NoteType.java index ff3119c..4d17867 100644 --- a/LLSIG/src/NoteType.java +++ b/LLSIG/src/main/java/LLSIG/NoteType.java @@ -1,3 +1,4 @@ +package main.java.LLSIG; public enum NoteType { NORMAL, diff --git a/LLSIG/src/Player.java b/LLSIG/src/main/java/LLSIG/Player.java similarity index 97% rename from LLSIG/src/Player.java rename to LLSIG/src/main/java/LLSIG/Player.java index 7db4d78..7a724a6 100644 --- a/LLSIG/src/Player.java +++ b/LLSIG/src/main/java/LLSIG/Player.java @@ -1,3 +1,4 @@ +package main.java.LLSIG; import javazoom.jl.decoder.JavaLayerException; public class Player { diff --git a/LLSIG/src/sig/utils/FileUtils.java b/LLSIG/src/main/java/sig/utils/FileUtils.java similarity index 98% rename from LLSIG/src/sig/utils/FileUtils.java rename to LLSIG/src/main/java/sig/utils/FileUtils.java index e334ebd..8e596c5 100644 --- a/LLSIG/src/sig/utils/FileUtils.java +++ b/LLSIG/src/main/java/sig/utils/FileUtils.java @@ -1,4 +1,4 @@ -package sig.utils; +package main.java.sig.utils; import java.io.BufferedReader; import java.io.File; diff --git a/LLSIG/src/test/java/LLSIG/AppTest.java b/LLSIG/src/test/java/LLSIG/AppTest.java new file mode 100644 index 0000000..d1b4ba5 --- /dev/null +++ b/LLSIG/src/test/java/LLSIG/AppTest.java @@ -0,0 +1,20 @@ +package LLSIG; + +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Unit test for simple App. + */ +public class AppTest +{ + /** + * Rigorous Test :-) + */ + @Test + public void shouldAnswerWithTrue() + { + assertTrue( true ); + } +}