diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..c1e2c64 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +# EditorConfig is awesome: https://EditorConfig.org + +# top-most EditorConfig file +root = true + +[*] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 27a5f22..f74aea8 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,12 +1,4 @@ -# These are supported funding model platforms - -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: salif # Replace with a single Patreon username -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +patreon: salifm +ko_fi: salif +liberapay: salif +custom: ['https://salif.eu/sponsor-me'] diff --git a/.gitignore b/.gitignore index ec228e7..863a8c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ -*.class +.gradle/ +build/ .idea/ -Tetris.iml \ No newline at end of file +*.class diff --git a/README.md b/README.md index 6257e09..538a265 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,12 @@ # Tetris + Fun & Simple Original tetris ## Download -[Tetris.jar](https://github.com/salifm/Tetris/raw/master/out/Tetris.jar) +Download [Tetris.jar](https://github.com/salifm/Tetris/raw/master/out/Tetris.jar) + +See releases [on Github](https://github.com/salif/Tetris/releases). ## How to play @@ -15,15 +18,17 @@ Fun & Simple Original tetris ### on Linux -![on linux](https://i.imgur.com/5zC5MkV.png) - -![on Linux](https://i.imgur.com/96jMEXf.png) +![Tetris screenshot on Linux](https://i.imgur.com/96jMEXf.png) ### on Window -![on window](https://i.imgur.com/THAGnd7.png) +![Tetris screenshot on Windows](https://i.imgur.com/zp9uXmk.png) + +## Links + +- [Homepage](https://salif.github.io/Tetris/) +- [Source code](https://github.com/salif/Tetris) -![on Windows](https://i.imgur.com/zp9uXmk.png) +### Forked from: -## Forked from: [github.com/ChihoWon/Tetris](https://github.com/ChihoWon/Tetris) diff --git a/_config.yml b/_config.yml index c419263..1bc9d8e 100644 --- a/_config.yml +++ b/_config.yml @@ -1 +1,9 @@ -theme: jekyll-theme-cayman \ No newline at end of file +theme: jekyll-theme-cayman + +title: "Tetris" +description: "Fun & Simple Original tetris" +show_downloads: false + +author: + name: Salif Mehmed + url: https://salif.eu diff --git a/_includes/head-custom.html b/_includes/head-custom.html new file mode 100644 index 0000000..4363396 --- /dev/null +++ b/_includes/head-custom.html @@ -0,0 +1 @@ + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..19c224d --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,35 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle + * User Manual available at https://docs.gradle.org/7.5.1/userguide/building_java_projects.html + */ + +plugins { + // Apply the application plugin to add support for building a CLI application in Java. + id 'application' +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + // Use JUnit Jupiter for testing. + testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' + + // This dependency is used by the application. + implementation 'com.google.guava:guava:31.0.1-jre' +} + +application { + // Define the main class for the application. + mainClass = 'com.github.salif.tetris.App' +} + +tasks.named('test') { + // Use JUnit Platform for unit tests. + useJUnitPlatform() +} diff --git a/src/com/salifm/tetris/Main.java b/app/src/main/java/com/github/salif/tetris/App.java similarity index 60% rename from src/com/salifm/tetris/Main.java rename to app/src/main/java/com/github/salif/tetris/App.java index 1e0b608..c0218b0 100644 --- a/src/com/salifm/tetris/Main.java +++ b/app/src/main/java/com/github/salif/tetris/App.java @@ -1,7 +1,6 @@ -package com.salifm.tetris; - -public class Main { +package com.github.salif.tetris; +public class App { public static void main(String[] args) { new GameWindow(); } diff --git a/src/com/salifm/tetris/GameBoardPanel.java b/app/src/main/java/com/github/salif/tetris/GameBoardPanel.java similarity index 80% rename from src/com/salifm/tetris/GameBoardPanel.java rename to app/src/main/java/com/github/salif/tetris/GameBoardPanel.java index ec3be89..4b335b4 100644 --- a/src/com/salifm/tetris/GameBoardPanel.java +++ b/app/src/main/java/com/github/salif/tetris/GameBoardPanel.java @@ -1,4 +1,4 @@ -package com.salifm.tetris; +package com.github.salif.tetris; import java.awt.Color; import java.awt.Dimension; @@ -8,18 +8,17 @@ import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import java.io.*; +import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.Timer; -import javax.swing.JOptionPane; -import javax.swing.UIManager; -import com.salifm.tetris.Tetromino.Tetrominoes; +import com.github.salif.tetris.Tetromino.Tetrominoes; public class GameBoardPanel extends JPanel implements ActionListener { - private static final int BoardWidth = 10; // game board x size - private static final int BoardHeight = 22; // game board y size + private static final long serialVersionUID = 6802492405004738658L; + private static final int BoardWidth = 10; // game board x size + private static final int BoardHeight = 22; // game board y size // game status & timer private Timer timer; @@ -44,26 +43,27 @@ public class GameBoardPanel extends JPanel implements ActionListener { private String currentLevel; private int currentTimerResolution; - private GameWindow tetrisFrameD; - - public GameBoardPanel(GameWindow tetrisFrame, int timerResolution) { setFocusable(true); setBackground(new Color(0, 30, 30)); curBlock = new Tetromino(); timer = new Timer(timerResolution, this); - timer.start(); // activate timer + timer.start(); // activate timer currentTimerResolution = timerResolution; gameBoard = new Tetrominoes[BoardWidth * BoardHeight]; // colour of tetrominoes - colorTable = new Color[]{ - new Color(0, 0, 0), new Color(164, 135, 255), - new Color(255, 128, 0), new Color(255, 0, 0), - new Color(32, 128, 255), new Color(255, 0, 255), - new Color(255, 255, 0), new Color(0, 255, 0) + colorTable = new Color[] { + new Color(0, 0, 0), + new Color(164, 135, 255), + new Color(255, 128, 0), + new Color(255, 0, 0), + new Color(32, 128, 255), + new Color(255, 0, 255), + new Color(255, 255, 0), + new Color(0, 255, 0) }; // keyboard listener @@ -118,7 +118,6 @@ public void keyPressed(KeyEvent e) { } }); - tetrisFrameD = tetrisFrame; initBoard(); } @@ -157,9 +156,6 @@ private void setResolution() { case 1: currentTimerResolution = 370; break; - case 0: - currentTimerResolution = 370; - break; } timer.setDelay(currentTimerResolution); @@ -241,7 +237,7 @@ public void paint(Graphics g) { } g.setColor(Color.WHITE); - g.setFont(new Font("Consolas", Font.PLAIN, 28)); + g.setFont(new Font(Font.MONOSPACED, Font.PLAIN, 28)); g.drawString(currentStatus, 15, 35); g.drawString(currentLevel, 15, 70); @@ -258,7 +254,8 @@ public void paint(Graphics g) { for (int i = 0; i < 4; i++) { int x = curX + curBlock.getX(i); int y = tempY - curBlock.getY(i); - drawTetromino(g, 0 + x * blockWidth(), boardTop + (BoardHeight - y - 1) * blockHeight(), curBlock.getShape(), + drawTetromino(g, 0 + x * blockWidth(), boardTop + (BoardHeight - y - 1) * blockHeight(), + curBlock.getShape(), true); } @@ -271,7 +268,6 @@ public void paint(Graphics g) { } } - // rendering - current tetromino if (curBlock.getShape() != Tetrominoes.NO_BLOCK) { for (int i = 0; i < 4; i++) { @@ -364,7 +360,7 @@ private void newTetromino() { curBlock.setShape(Tetrominoes.NO_BLOCK); timer.stop(); isStarted = false; - GameOver(currentScore); + gameOver(currentScore); } } @@ -398,48 +394,8 @@ private void advanceToEnd() { tetrominoFixed(); } - private void GameOver(int dbScore) { - int maxScore = readDB(); - String showD = ""; - if (dbScore > maxScore) { - writeDB(dbScore); - showD = String.format("%nCongratulations! %nNew max score: %d", dbScore); - } else { - showD = String.format("Score: %d %nMax score: %d", dbScore, maxScore); - } - UIManager.put("OptionPane.okButtonText", "new game"); - JOptionPane.showMessageDialog(null, showD, "Game Over!", JOptionPane.OK_OPTION); - setResolution(); - start(); - } - - private int readDB() { - try { - BufferedReader inputStream = new BufferedReader(new FileReader("Tetris.score")); - String dbMaxScore = inputStream.readLine(); - inputStream.close(); - return Integer.parseInt(dbMaxScore); - } catch (IOException e) { - return -1; - } catch (NumberFormatException e) { - return -1; - } + private void gameOver(int score) { + JOptionPane.showMessageDialog(null, "", "Game Over!", JOptionPane.OK_OPTION); } - private void writeDB(int dbScore) { - try { - File UIFile = new File("Tetris.score"); - if (!UIFile.exists()) { - UIFile.createNewFile(); - } - FileWriter filewriter = new FileWriter(UIFile.getAbsoluteFile()); - BufferedWriter outputStream = new BufferedWriter(filewriter); - outputStream.write(String.valueOf(dbScore)); - outputStream.newLine(); - outputStream.write("This is database for Tetris game - https://github.com/salifm/Tetris"); - outputStream.close(); - } catch (IOException e) { - System.out.println(e.getMessage()); - } - } } diff --git a/src/com/salifm/tetris/GameWindow.java b/app/src/main/java/com/github/salif/tetris/GameWindow.java similarity index 84% rename from src/com/salifm/tetris/GameWindow.java rename to app/src/main/java/com/github/salif/tetris/GameWindow.java index 9a8a0e4..eceb122 100644 --- a/src/com/salifm/tetris/GameWindow.java +++ b/app/src/main/java/com/github/salif/tetris/GameWindow.java @@ -1,10 +1,12 @@ -package com.salifm.tetris; +package com.github.salif.tetris; import java.awt.GridLayout; import javax.swing.JFrame; public class GameWindow extends JFrame { + private static final long serialVersionUID = 8737819995837542594L; + public GameWindow() { setTitle("Tetris :D"); setSize(400, 814); diff --git a/src/com/salifm/tetris/Tetromino.java b/app/src/main/java/com/github/salif/tetris/Tetromino.java similarity index 76% rename from src/com/salifm/tetris/Tetromino.java rename to app/src/main/java/com/github/salif/tetris/Tetromino.java index be38967..6e95398 100644 --- a/src/com/salifm/tetris/Tetromino.java +++ b/app/src/main/java/com/github/salif/tetris/Tetromino.java @@ -1,29 +1,27 @@ -package com.salifm.tetris; +package com.github.salif.tetris; import java.util.Random; public class Tetromino { enum Tetrominoes { NO_BLOCK, Z_SHAPE, S_SHAPE, I_SHAPE, T_SHAPE, O_SHAPE, L_SHAPE, J_SHAPE - } - - ; + }; private Tetrominoes tetrominoes; - private int coords[][]; // current shape of a tetromino + private int coords[][]; // current shape of a tetromino private int tetrominoTable[][][]; public Tetromino() { coords = new int[4][2]; - tetrominoTable = new int[][][]{ - {{0, 0}, {0, 0}, {0, 0}, {0, 0}}, // NO_BLOCK - {{0, -1}, {0, 0}, {-1, 0}, {-1, 1}}, // Z_SHAPE - {{0, -1}, {0, 0}, {1, 0}, {1, 1}}, // S_SHAPE - {{0, -1}, {0, 0}, {0, 1}, {0, 2}}, // I_SHAPE - {{-1, 0}, {0, 0}, {1, 0}, {0, 1}}, // T_SHAPE - {{0, 0}, {1, 0}, {0, 1}, {1, 1}}, // O_SHAPE - {{-1, -1}, {0, -1}, {0, 0}, {0, 1}}, // L_SHAPE - {{1, -1}, {0, -1}, {0, 0}, {0, 1}} // J_SHAPE + tetrominoTable = new int[][][] { + { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } }, // NO_BLOCK + { { 0, -1 }, { 0, 0 }, { -1, 0 }, { -1, 1 } }, // Z_SHAPE + { { 0, -1 }, { 0, 0 }, { 1, 0 }, { 1, 1 } }, // S_SHAPE + { { 0, -1 }, { 0, 0 }, { 0, 1 }, { 0, 2 } }, // I_SHAPE + { { -1, 0 }, { 0, 0 }, { 1, 0 }, { 0, 1 } }, // T_SHAPE + { { 0, 0 }, { 1, 0 }, { 0, 1 }, { 1, 1 } }, // O_SHAPE + { { -1, -1 }, { 0, -1 }, { 0, 0 }, { 0, 1 } }, // L_SHAPE + { { 1, -1 }, { 0, -1 }, { 0, 0 }, { 0, 1 } } // J_SHAPE }; setShape(Tetrominoes.NO_BLOCK); diff --git a/app/src/test/java/com/github/salif/tetris/AppTest.java b/app/src/test/java/com/github/salif/tetris/AppTest.java new file mode 100644 index 0000000..f677a25 --- /dev/null +++ b/app/src/test/java/com/github/salif/tetris/AppTest.java @@ -0,0 +1,14 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +package com.github.salif.tetris; + +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.*; + +class AppTest { + @Test void appHasAGreeting() { + App classUnderTest = new App(); + // assertNotNull(classUnderTest.getGreeting(), "app should have a greeting"); + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..2c35211 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..09523c0 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 +# +# https://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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# 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" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 https://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 +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/out/Tetris.jar b/out/Tetris.jar deleted file mode 100644 index e20f313..0000000 Binary files a/out/Tetris.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..0a8eab7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.5.1/userguide/multi_project_builds.html + */ + +rootProject.name = 'Tetris' +include('app')