diff --git a/.github/FUNDING.YML b/.github/FUNDING.YML new file mode 100644 index 0000000..688de58 --- /dev/null +++ b/.github/FUNDING.YML @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: [ 'https://paypal.me/caden2k3' ] diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..1e70622 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,33 @@ +--- +name: Bug report +about: Use this template if you're running into bugs or other issues +title: '' +labels: bug +assignees: '' + +--- + +### Expected Behavior +Replace this text with what you expected to happen. +_Example: The Piston should extend._ + +### Actual Behavior +Replace this text with what actually happened. +_Example: The Piston does not extend._ + +### Reproduction Steps +Provide information on how to reproduce this game crash. You can either fill in the example below or do something else -- just make sure your instructions are minimal and clear! If applicable, please provide a world file as a compressed ZIP which contains a minimally reproducible example of the issue. + +1. Place a Redstone Lamp beside a Redstone Repeater +2. Use a Lever to activate the Redstone Repeater +3. Nothing happens + +### Attachments +Add any relevant screenshots or videos to this issue as you feel necessary to explain the issue. + +### System Information +You can obtain this information from the in-game debug screen or through using [DxDiag](https://support.microsoft.com/en-us/help/4028644/windows-open-and-run-dxdiagexe) on Windows. + +- Java Version: [fill me in] +- CPU: [fill me in] +- GPU: [fill me in] diff --git a/.github/ISSUE_TEMPLATE/crash-report.md b/.github/ISSUE_TEMPLATE/crash-report.md new file mode 100644 index 0000000..effc53b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/crash-report.md @@ -0,0 +1,21 @@ +--- +name: Crash report +about: Use this template if your game is crashing or failing to start correctly +title: '' +labels: crash +assignees: '' + +--- + +### Reproduction Steps +Provide information on how to reproduce this game crash. This step is critical for ensuring that your crash can be debugged by other developers. You can either fill in the example below or do something else -- just make sure your instructions are minimal and clear. If applicable, provide a Minecraft save containing a minimal example on how to reproduce this crash as a compressed ZIP file. + +1. Place a Redstone Lamp beside a Redstone Repeater +2. Use a Lever to activate the Redstone Repeater +3. The game crashes + +### Crash Report File +Please upload your crash report as a file to [GitHub Gist](https://gist.github.com/) and replace this text with a link to the uploaded report. + +### Additional Information +Provide any additional information or context which may be relevant to the issue. If you have none to add, you can remove this section. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..11fc491 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/PULL_REQUEST_TEMPLATE/bug_fix.md b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md new file mode 100644 index 0000000..2691616 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/bug_fix.md @@ -0,0 +1,26 @@ +--- +name: Bug fix +about: Use this template if you're creating a pull request which fixes another bug or issue +title: '' +labels: bug +assignees: '' + +--- + +### Preface + +Please read our [Contributor Guidelines](https://github.com/fl0gic/smooth-chunks/blob/main/contributing.md) before +submitting any pull requests to this repository. + +By submitting a pull request, you are indicating that you agree to the [Contributor License Agreement](https://github.com/fl0gic/smooth-chunks/blob/main/contributing.md#contributor-license-agreement-cla) +and that your code will be licensed irrecoverably under the GNU LGPLv3. If you do not agree to these terms, do not open +a pull request. + +Please remove this section before submitting your pull request. Doing so indicates that you have read and acknowledged it. + +### Linked Issues +Provide links to the issue(s) which will be closed upon merging this pull request. There must be an open issue for +pull requests which fix bugs or other issues. + +### Proposed Changes +Provide a detailed description of what your pull request changes. diff --git a/.github/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md new file mode 100644 index 0000000..7f35be9 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -0,0 +1,22 @@ +--- +name: Bug fix +about: Use this template if you're creating a pull request which adds a feature or other enhancement +title: '' +labels: enhancement +assignees: '' + +--- + +### Preface + +Please read our [Contributor Guidelines](https://github.com/jellysquid3/sodium-fabric/blob/1.15.x/CONTRIBUTING.md) before +submitting any pull requests to this repository. + +By submitting a pull request, you are indicating that you agree to the [Contributor License Agreement](https://github.com/jellysquid3/sodium-fabric/blob/1.15.x/CONTRIBUTING.md#contributor-license-agreement-cla) +and that your code will be licensed irrecoverably under the GNU LGPLv3. If you do not agree to these terms, do not open +a pull request. + +Please remove this section before submitting your pull request. Doing so indicates that you have read and acknowledged it. + +### Proposed Changes +Provide a detailed description of what your pull request changes. diff --git a/LICENSE b/LICENSE index f13e51e..b057ed9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020 flogic +Copyright (c) 2020 Caden Kriese Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/build.gradle b/build.gradle index 9c067ed..56ea7f4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import org.apache.tools.ant.filters.ReplaceTokens - plugins { id 'fabric-loom' version '0.5-SNAPSHOT' id 'maven-publish' @@ -22,11 +20,11 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // Cloth Config / Autoconfig - modApi("me.shedaniel.cloth:config-2:4.8.2") { + modImplementation("me.shedaniel.cloth:config-2:4.8.2") { exclude(group: "net.fabricmc.fabric-api") exclude module: "modmenu" } - modApi("me.sargunvohra.mcmods:autoconfig1u:3.2.2") { + modImplementation("me.sargunvohra.mcmods:autoconfig1u:3.2.2") { exclude(group: "net.fabricmc.fabric-api") } include "me.shedaniel.cloth:config-2:4.8.2" @@ -50,7 +48,6 @@ processResources { from(sourceSets.main.resources.srcDirs) { include "fabric.mod.json" -// filter(ReplaceTokens, tokens: [version: project.version]) expand "version": project.version } diff --git a/contributing.md b/contributing.md new file mode 100644 index 0000000..10d9a92 --- /dev/null +++ b/contributing.md @@ -0,0 +1,42 @@ +## Issues + +When opening issues, please be sure to include the following information as applicable. + +- The exact version of the mod you are running, such as `0.1.0-fabric`, and the version of Fabric/Forge you are using. +- If your issue is a crash, attach the latest client or server log and the complete crash report as a file. You can +attach these as a file (preferred) or host them on a service such as [GitHub Gist](https://gist.github.com/) or [Hastebin](https://hastebin.com/). +- If your issue is a bug or otherwise unexpected behavior, explain what you expected to happen. +- If your issue only occurs with other mods installed, be sure to specify the names and versions of those mods. + +## Pull Requests + +It's super awesome to hear you're wishing to contribute to the project! Before you open a pull request, you'll need to +give a quick read to the following guidelines. + +### Contributor License Agreement (CLA) + +By submitting changes to this repository, you are hereby agreeing that: + +- Your contributions will be licensed irrecoverably under the [MIT License](https://mit-license.org). +- Your contributions are of your own work and free of legal restrictions (such as patents and copyrights) or other +issues which would pose issues for inclusion or distribution under the above license. + +If you do not agree to these terms, please do not submit contributions to this repository. + +### Code Style + +When contributing source code changes to the project, ensure that you make consistent use of the code style guidelines +used throughout the codebase (which follow pretty closely after the standard Java code style guidelines). These guidelines +have also been packaged as EditorConfig and IDEA inspection profiles which can be found in the repository root and `idea` +directory respectively. + +- Use 4 spaces for indentation, not tabs. Avoid lines which exceed 120 characters. +- Use `this` to qualify member and field access. +- Always use braces when writing if-statements and loops. +- Annotate overriding methods with `@Override` so that breaking changes when updating will create hard compile errors. + +### Making a Pull Request + +Your pull request should include a brief description of the changes it makes and link to any open issues which it +resolves. You should also ensure that your code is well documented where non-trivial and that it follows the +outlined code style guidelines above. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e1edfe5..b45623d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html minecraft_version=1.16.3 -yarn_mappings=1.16.3+build.17 -loader_version=0.10.0+build.208 +yarn_mappings=1.16.3+build.47 +loader_version=0.10.1+build.209 # Mod Properties mod_version=0.1.0-SNAPSHOT maven_group=cc.flogi.dev archives_base_name=smooth-chunks # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.22.0+build.408-1.16 +fabric_version=0.24.0+build.411-1.16 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de..be52383 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -130,7 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index a9f778a..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,21 +64,6 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line @@ -86,7 +71,7 @@ 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 %CMD_LINE_ARGS% +"%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