Skip to content

Commit

Permalink
Converted to LF line separator
Browse files Browse the repository at this point in the history
  • Loading branch information
Litorom committed Dec 30, 2023
1 parent 64a5f18 commit e0628ca
Show file tree
Hide file tree
Showing 193 changed files with 4,753 additions and 2,847 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ charset = utf-8
indent_style = tab
indent_size = tab
tab_width = 4
ij_java_imports_layout = *,|,javax.**,|,java.**,|,$*
ij_java_imports_layout = *, |, javax.**, |, java.**, |, $*
ij_java_packages_to_use_import_on_demand = unset
ij_java_class_count_to_use_import_on_demand = 99999999
ij_java_names_count_to_use_import_on_demand = 99999999
Expand Down
6 changes: 4 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. See error
Expand All @@ -23,8 +24,9 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. Windows]
- Game version [e.g. 2.0.7]

- OS: [e.g. Windows]
- Game version [e.g. 2.0.7]

**Additional context**
Add any other context about the problem here.
46 changes: 23 additions & 23 deletions .github/workflows/autobuild.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: Nightly build
on:
schedule:
- cron: '0 0 * * *'
- cron: '0 0 * * *'
workflow_dispatch:

jobs:
gradle:
strategy:
matrix:
os: [ubuntu-latest]
os: [ ubuntu-latest ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8
- name: Setup Gradle
uses: gradle/[email protected]
- name: Execute Gradle build
run: ./gradlew build
- uses: actions/[email protected]
with:
name: "Nightly release"
path: |
LICENSE
ChangeLog.md
build/libs/**.jar
if-no-files-found: error
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 8

- name: Setup Gradle
uses: gradle/[email protected]

- name: Execute Gradle build
run: ./gradlew build

- uses: actions/[email protected]
with:
name: "Nightly release"
path: |
LICENSE
ChangeLog.md
build/libs/**.jar
if-no-files-found: error
54 changes: 27 additions & 27 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,36 +37,36 @@ jobs:
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: publish
on: [workflow_dispatch] # Manual trigger
on: [ workflow_dispatch ] # Manual trigger
jobs:
build:
strategy:
Expand Down
7 changes: 6 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ but some sections are changed to compliant this project.
* Added obsidian knight as the second boss
* Added limitation to inventories
* Added limitation to stackable items
* Added seven new debug arguments - `--debug-log-time`, `--debug-log-thread`, `--debug-log-trace`, `--debug-filelog-full`, `--debug-level`, `--debug-locale`, `--debug-unloc-tracing`
* Added seven new debug
arguments - `--debug-log-time`, `--debug-log-thread`, `--debug-log-trace`, `--debug-filelog-full`, `--debug-level`, `--debug-locale`, `--debug-unloc-tracing`
* Added a new argument for disabling hardware acceleration - `--no-hardware-acceleration`
* Added a toggle for HUD display
* Added a toggle for simplified effect display
Expand Down Expand Up @@ -412,7 +413,11 @@ but some sections are changed to compliant this project.
> * Added an Iron Lantern at the entrance of the purple dungeon
[2.2.0]: https://github.com/MinicraftPlus/minicraft-plus-revived/compare/v2.1.3...HEAD

[2.1.3]: https://github.com/MinicraftPlus/minicraft-plus-revived/compare/v2.1.2...v2.1.3

[2.1.2]: https://github.com/MinicraftPlus/minicraft-plus-revived/compare/v2.1.1...v2.1.2

[2.1.1]: https://github.com/MinicraftPlus/minicraft-plus-revived/compare/v2.1.0...v2.1.1

[2.1.0]: https://github.com/MinicraftPlus/minicraft-plus-revived/compare/v2.0.7...v2.1.0
6 changes: 6 additions & 0 deletions Credits.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
## Credits

Original game by Markus "Notch" Persson.

### Former maintainers

* David.b
* Dillyg10
* Chris J
* afyber

### Current maintainer

* Makkkkus

### Code contributions from

* A.L.I.C.E
* BenCheung0422
* Christoffer Holmesland
Expand All @@ -21,11 +25,13 @@ Original game by Markus "Notch" Persson.
* rocketedsocks

### Art contributions from

* TheBigEye
* JamesTDG
* Geek_Joystick

### Localisation contributions from

* A.L.I.C.E
* Christoffer Holmesland
* GladfanIsHere
Expand Down
49 changes: 34 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,27 @@
[![CodeQL](https://github.com/MinicraftPlus/minicraft-plus-revived/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/MinicraftPlus/minicraft-plus-revived/actions/workflows/codeql-analysis.yml)

# Minicraft+

![Minicraft+](https://user-images.githubusercontent.com/37084190/138313821-75ac3112-7044-45c1-bdbb-d89f2333c2c0.png)

Minicraft+ is an overhaul mod of Minicraft, a game made by Markus "Notch" Persson in the Ludum Dare 22 contest. To learn more about Minicraft take a look at [playminicraft.com](https://www.playminicraft.com), talk to the community at our [Discord](https://discord.me/minicraft), or check out our [Fandom Wiki](https://minicraft.fandom.com/wiki/Minicraft_Wiki).
Minicraft+ is an overhaul mod of Minicraft, a game made by Markus "Notch" Persson in the Ludum Dare 22 contest. To learn
more about Minicraft take a look at [playminicraft.com](https://www.playminicraft.com), talk to the community at
our [Discord](https://discord.me/minicraft), or check out
our [Fandom Wiki](https://minicraft.fandom.com/wiki/Minicraft_Wiki).

Check the [releases](https://github.com/minicraftplus/minicraft-plus-revived/releases) page to download the latest version, or older versions.
Check the [releases](https://github.com/minicraftplus/minicraft-plus-revived/releases) page to download the latest
version, or older versions.

## Major features

* Four new gamemodes
* Creative
* Hardcore
* Score
* Survival
* Creative
* Hardcore
* Score
* Survival
* Saving and loading
* Multiplayer mode and an account system (Now supported by [El-Virus](https://www.github.com/ElVir-Software/minicraft-plus-online))
* Multiplayer mode and an account system (Now supported
by [El-Virus](https://www.github.com/ElVir-Software/minicraft-plus-online))
* More mobs
* Personal crafting menu
* Beds
Expand All @@ -33,24 +40,36 @@ Check the [releases](https://github.com/minicraftplus/minicraft-plus-revived/rel
* and many, many more!

## Current goals and ideas
Take a look at the [ideas](ideas/) folder or the [issues](https://github.com/minicraftplus/minicraft-plus-revived/issues) page.

Take a look at the [ideas](ideas/) folder or
the [issues](https://github.com/minicraftplus/minicraft-plus-revived/issues) page.

## Getting the game and run the game
Head over [releases](https://github.com/minicraftplus/minicraft-plus-revived/releases) and find the latest version of Minicraft+.
There, you can find an file called `minicraft_plus.jar`. Click the file, and after you have downloaded the file, you must double-click the file in downloads folder to open it.
You must first confirm that you have [Java](https://www.java.com/en/download/) (at least version 8) installed on your computer.

Head over [releases](https://github.com/minicraftplus/minicraft-plus-revived/releases) and find the latest version of
Minicraft+.
There, you can find an file called `minicraft_plus.jar`. Click the file, and after you have downloaded the file, you
must double-click the file in downloads folder to open it.
You must first confirm that you have [Java](https://www.java.com/en/download/) (at least version 8) installed on your
computer.

## Localization
This project is running with an external localization platform called POEditor. You can contribute localization by clicking the image below!

This project is running with an external localization platform called POEditor. You can contribute localization by
clicking the image below!

[![Minicraft+ POEditor Stats](https://minicraft-plus-poeditor-stats.vercel.app/api/card)](https://minicraft-plus-poeditor-stats.vercel.app)

## How to build/run in development

Because this project uses a build tool called gradle it is very easy to build or run the project from the source code.

1. Download the source code by clicking the green code button, and download it as a ZIP.
2. Extract the contents of the folder.
3. Open command prompt and enter `cd <folder_location>`, this will open the folder in the command prompt.
4. Type `gradlew run` or `gradlew build` to run or build the program. This might take some time. If on unix, add "./" to the front.
1. If you built the project, the jar file is found in `build/libs`
2. If you get an error screaming that you're missing java. You need to [set up](https://confluence.atlassian.com/doc/setting-the-java_home-variable-in-windows-8895.html) your JAVA_HOME environment variable, or download a JDK if you haven't already.
4. Type `gradlew run` or `gradlew build` to run or build the program. This might take some time. If on unix, add "./" to
the front.
1. If you built the project, the jar file is found in `build/libs`
2. If you get an error screaming that you're missing java. You need
to [set up](https://confluence.atlassian.com/doc/setting-the-java_home-variable-in-windows-8895.html) your
JAVA_HOME environment variable, or download a JDK if you haven't already.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ jar {

from files(sourceSets.main.output.classesDirs)
from files(sourceSets.main.output.resourcesDir)
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }}
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
}

// Don't override if we're building a tar package.
tasks.withType(Tar){
tasks.withType(Tar) {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}
tasks.withType(Zip){
tasks.withType(Zip) {
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ include "common"
include "client"
include "server"

rootProject.children.each {project ->
rootProject.children.each { project ->
project.projectDir = new File(settingsDir, "src/${project.name}")
}
4 changes: 2 additions & 2 deletions src/client/java/minicraft/core/Action.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@FunctionalInterface
public interface Action {

void act();

}
Loading

0 comments on commit e0628ca

Please sign in to comment.