Merge remote-tracking branch 'upstream/main' into biome

# Conflicts:
#	src/client/java/minicraft/gfx/Rectangle.java
#	src/client/java/minicraft/level/Level.java
#	src/client/java/minicraft/level/LevelGen.java
#	src/client/java/minicraft/level/Structure.java

.editorconfig

@@ -8,14 +8,35 @@ charset = utf-8
 [**.java]
 indent_style = tab
 indent_size = tab
+ij_smart_tabs = true
 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
 ij_java_use_single_class_imports = true
 ij_java_insert_inner_class_imports = false
 ij_java_layout_static_imports_separately = true
+ij_java_space_before_array_initializer_left_brace = true
+ij_java_block_comment_add_space = true
+ij_java_line_comment_add_space = true
+ij_java_space_after_closing_angle_bracket_in_type_argument = true
+ij_java_space_before_annotation_array_initializer_left_brace = true
+ij_java_spaces_within_array_initializer_braces = true
+ij_java_spaces_within_braces = true
+ij_java_doc_add_blank_line_after_description = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_indent_on_continuation = true
+ij_java_doc_do_not_wrap_if_one_line = true
+ij_java_keep_simple_blocks_in_one_line = true
+ij_java_keep_simple_classes_in_one_line = true
+ij_java_keep_simple_lambdas_in_one_line = true
+ij_java_keep_simple_methods_in_one_line = true
+ij_java_method_annotation_wrap = on_every_item
+ij_java_field_annotation_wrap = on_every_item
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_not_wrap_after_single_annotation_in_parameter = true
+ij_java_indent_case_from_switch = true
 
 [**.json]
 indent_style = space

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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
@@ -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.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Question
+    url: https://github.com/MinicraftPlus/minicraft-plus-revived/discussions
+    about: Ask a question

.github/workflows/autobuild.yml

@@ -1,36 +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: "dciborow/[email protected]"
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        prerelease: true
-        title: "Nightly (breaking)"
-        generate_release_notes: true
-        files: |
-          LICENSE
-          ChangeLog.md
-          build/libs/**.jar
-        
+      - 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

.github/workflows/codeql-analysis.yml

@@ -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

.github/workflows/publish.yml

@@ -1,18 +1,25 @@
-name: publish
-on: [workflow_dispatch] # Manual trigger
+name: Publish package to GitHub Packages
+on:
+  release:
+    types: [created]
 jobs:
-  build:
-    strategy:
-      matrix:
-        java: [ 8-jdk ]
-    runs-on: ubuntu-20.04
-    container:
-      image: eclipse-temurin:${{ matrix.java }}
-      options: --user root
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
-      - uses: actions/checkout@v1
-      - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew publish --stacktrace
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'oracle'
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3
+      - name: Publish package
+        uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629
+        with:
+          arguments: publish
         env:
-          MAVEN_PUBLISH_TOKEN: ${{ secrets.MAVEN_PUBLISH_TOKEN }}
-          MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}

.gitignore

@@ -1,3 +1,6 @@
+# dev savedir folder
+run/
+
 # Compiled class file
 *.class
 

ChangeLog.md

@@ -7,16 +7,42 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 but some sections are changed to compliant this project.
 
+## [2.2.1]
+
+### Additions
+
+* Added ornate wood tiles
+
+### Changes
+
+* Disabled hardware acceleration by default
+* Hardware acceleration is now a toggle in settings
+* Screenshots will now be the size of the rendered view within the window
+* Updated localization
+
+### Removals
+
+* Removed argument flag `--no-hardware-acceleration`
+* Removed screenshot size setting
+
+### Fixes
+
+* Optimized light source rendering
+* Optimized calculations
+* Fixed the texture on stone hoe
+
 ## [2.2.0]
 
 ### Additions
 
-* Added a quest system
-* Added tutorial
-* Added obsidian knight as the second boss
+* Added quest system
+* Added tutorials
+* Added obsidian knight as the second boss (Air Wizard II replacement)
 * Added limitation to inventories
 * Added limitation to stackable items
-* Added four new debug arguments - `--debug-log-time`, `--debug-log-thread`, `--debug-log-trace`, `--debug-filelog-full`
+* 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
 * Added a new menu for creative mode
@@ -25,17 +51,17 @@ but some sections are changed to compliant this project.
 * Added a crash handler and a better look of dialog.
 * Added a simple ability for screenshots
 * Added dynamic for sounds
-* Added sand particle for sand
+* ReAdded sand footprint particle for sand
 * Added characters to the font (`ÀÂÄÈÎÌÏÒÙÛÝ*«»£$&€§ªº`)
 * Added world-wide seed
 * Added controller support
 * Added on-screen keyboard
-* Added logo splash screen
 * Added glass bottle and made potions return glass bottles when used
-* Added dyes (#445)
-* Added coloured sheep (#445)
-* Added ability to dye sheep and beds (#445)
-* Cow and sheep now graze on grasses
+* Added a trigger to auto-enable hardware acceleration
+* Added support for lower-cased letters
+* Added item description menu
+* Added fences
+* Added editable signs
 
 ### Changes
 
@@ -46,22 +72,41 @@ but some sections are changed to compliant this project.
 * If the application flag `--savedir` is present, '.playminicraft/mods/Minecraft Plus' will no longer be appended
 * Updated all ore-related and metal-related textures
 * Made the parent display render in the background
-* Made recipies unlockable
+* Made recipes unlockable
 * Made you reobtain your old clothes when putting on new clothing
+* Made you reobtain empty bottles when a bottle of potion is consumed
 * Made languages fallback to English
 * Improved the tile place indicator
 * Overhauled debugging actions
+* Overhauled the farming system
+* Changed the languaging setting menu
+* Optimized CPU usage
+* Reduced food stamina cost
+* Made some strings lower-cased
+* Updated spawning and despawning conditions
+* Iron and gold now require 3 ores instead of 4 for crafting
+* Renamed `assets/books/story_guide.txt` to `assets/books/game_guide.txt`
+* Updated `assets/books/game_guide.txt` and `assets/books/instructions.txt`
+* Sand footprints are now more accurately placed
+* Optimized rendering
+* Increased death chest despawn timer as follows:
+  Easy: 450 secs, Normal: 300 secs, Hard: 150 secs
 
 ### Removals
 
-* Removed stepped sand texture
+* None (compared to 2.1.3)
 
 ### Fixes
 
 * Fixed seed random problem
 * Fixed rendering positioning problem of color code styled texts
 * Fixed lights disappearing when out of screen
 * Fixed animals and items destroying plants
+* Fixed various old world loading crashes, including migration to the new destination
+* Fixed possible crash when Air Wizard is not loaded
+* Fixed minor loading bugs to dungeon chests
+* Fixed performance issue in WaterTile ticking
+* Fixed majority of audio issues
 
 ## [2.1.3]
 
@@ -400,7 +445,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