[1.18] 3.1.1 hotfix (#19)

* remove idea folder

* update dependencies

* update forge

* switch to parchment mappings

* fix data saving method

fixes #18

* formatting update

* update changelog

* bump version

* centralized mod credits

* add CI support for beta and alpha versions

.editorconfig

@@ -40,7 +40,7 @@ ij_java_align_multiline_assignment = false
 ij_java_align_multiline_binary_operation = false
 ij_java_align_multiline_chained_methods = false
 ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = false
+ij_java_align_multiline_for = true
 ij_java_align_multiline_method_parentheses = false
 ij_java_align_multiline_parameters = false
 ij_java_align_multiline_parameters_in_calls = false
@@ -62,7 +62,7 @@ ij_java_assignment_wrap = normal
 ij_java_binary_operation_sign_on_next_line = false
 ij_java_binary_operation_wrap = normal
 ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 1
+ij_java_blank_lines_after_class_header = 0
 ij_java_blank_lines_after_imports = 1
 ij_java_blank_lines_after_package = 1
 ij_java_blank_lines_around_class = 1
@@ -135,8 +135,8 @@ ij_java_keep_control_statement_in_one_line = true
 ij_java_keep_first_column_comment = false
 ij_java_keep_indents_on_empty_lines = false
 ij_java_keep_line_breaks = false
-ij_java_keep_multiple_expressions_in_one_line = true
-ij_java_keep_simple_blocks_in_one_line = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
 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
@@ -153,7 +153,7 @@ ij_java_method_parameters_new_line_after_left_paren = true
 ij_java_method_parameters_right_paren_on_new_line = true
 ij_java_method_parameters_wrap = normal
 ij_java_modifier_list_wrap = false
-ij_java_names_count_to_use_import_on_demand = 5
+ij_java_names_count_to_use_import_on_demand = 3
 ij_java_new_line_after_lparen_in_record_header = false
 ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
 ij_java_parameter_annotation_wrap = off
@@ -313,9 +313,9 @@ ij_markdown_force_one_space_after_header_symbol = true
 ij_markdown_force_one_space_after_list_bullet = true
 ij_markdown_force_one_space_between_words = true
 ij_markdown_keep_indents_on_empty_lines = false
-ij_markdown_max_lines_around_block_elements = 0
-ij_markdown_max_lines_around_header = 0
-ij_markdown_max_lines_between_paragraphs = 0
+ij_markdown_max_lines_around_block_elements = 1
+ij_markdown_max_lines_around_header = 1
+ij_markdown_max_lines_between_paragraphs = 1
 ij_markdown_min_lines_around_block_elements = 1
-ij_markdown_min_lines_around_header = 2
+ij_markdown_min_lines_around_header = 1
 ij_markdown_min_lines_between_paragraphs = 1

.github/workflows/ci.yml

@@ -14,8 +14,8 @@ on:
 env:
   JAVA_DIST: 'zulu'
   JAVA_VERSION: 17
-  JAR_NAME: 'energymeter'
-  FILE_NAME: 'EnergyMeter'
+  MOD_ID: 'energymeter'
+  MOD_NAME: 'EnergyMeter'
 
 jobs:
   build:
@@ -90,15 +90,24 @@ jobs:
           chmod +x ./gradlew
           ./gradlew jar --no-daemon
 
-      - name: JAR manipulation
+      - name: Collect version information
         run: |
-          echo "JAR_FILE=$(find build/libs/${{ env.JAR_NAME }}-*-*.jar)" >> $GITHUB_ENV
-          echo ${JAR_FILE%.*} | awk -F- '{ print "MINECRAFT_VERSION=" $2; print "MOD_VERSION=" $3; }' >> $GITHUB_ENV
+          shopt -s failglob # print a warning if a glob does not match anything
+          set_var() {
+            echo $1="$2"
+            echo $1="$2" >> $GITHUB_ENV
+            declare -g $1="$2"
+          }
+          set_var JAR_FILE $(eval echo build/libs/${{ env.MOD_ID }}-*-*.jar)
+          set_var MINECRAFT_VERSION $(echo ${JAR_FILE%.*} | cut -d- -f2)
+          set_var MOD_VERSION $(echo ${JAR_FILE%.*} | cut -d- -f3)
+          set_var RELEASE_TYPE "$(echo ${GITHUB_REF##*/} | cut -d- -f3)"
+          set_var PRE_RELEASE "$([[ -z $RELEASE_TYPE ]] && echo false || echo true)"
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.FILE_NAME }}-${{ env.MINECRAFT_VERSION }}-${{ env.MOD_VERSION }}.jar
+          name: ${{ env.MOD_NAME }}-${{ env.MINECRAFT_VERSION }}-${{ env.MOD_VERSION }}.jar
           path: ${{ env.JAR_FILE }}
 
       - name: Release
@@ -107,9 +116,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           files: ${{ env.JAR_FILE }}
+          prerelease: ${{ env.PRE_RELEASE }}
 
       - name: Upload to CurseForge
         run: ./gradlew curseforge
         env:
           CF_API_KEY: ${{ secrets.CF_API_KEY }}
-          FILE_NAME: ${{ env.FILE_NAME }}
+          RELEASE_TYPE: ${{ env.RELEASE_TYPE }}

.gitignore

@@ -2,48 +2,13 @@
 run/
 
 ### Intellij ###
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-.idea/artifacts
-.idea/compiler.xml
-.idea/jarRepositories.xml
-.idea/modules.xml
-.idea/*.iml
-.idea/modules
+.idea/
 *.iml
 *.ipr
 
 # CMake
 cmake-build-*/
 
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
 # File-based project format
 *.iws
 
@@ -56,40 +21,12 @@ out/
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-# Cursive Clojure plugin
-.idea/replstate.xml
-
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-# Sonarlint plugin
-.idea/**/sonarlint/
-.idea/sonarlint.xml
-.idea/sonarlint-state.xml
-
-# SonarQube Plugin
-.idea/**/sonarIssues.xml
-
-# Markdown Navigator plugin
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
-.idea/**/markdown-navigator/
-
-# Cache file creation bug
-.idea/$CACHE_FILE$
-
-# CodeStream plugin
-.idea/codestream.xml
-
 ### Java ###
 # Compiled class file
 *.class
@@ -115,122 +52,6 @@ fabric.properties
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 
-### Node ###
-# Logs
-logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-bower_components
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-web_modules/
-
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-.env.production
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-.parcel-cache
-
-# Next.js build output
-.next
-out
-
-# Nuxt.js build / generate output
-.nuxt
-dist
-
-# Gatsby files
-.cache/
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-
 ### VisualStudioCode ###
 .vscode/*
 !.vscode/settings.json
@@ -242,10 +63,6 @@ dist
 # Local History for Visual Studio Code
 .history/
 
-### VisualStudioCode Patch ###
-.history
-.ionide
-
 ### Gradle ###
 .gradle
 build/
@@ -268,12 +85,6 @@ gradle-app.setting
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
-# Files
-**/desktop.files.json
-
-# project specific
-.idea/runConfigurations
-.idea/discord.xml
-.idea/vcs.xml
+# Project Specific
 src/generated
 src/test