port to forge

calculate position inside blocks
changed menu
changed modid to cavedust
change some default values
fix bug where user got softlocked in the particle cycle in multiplayer

.github/workflows/build-release.yml

@@ -0,0 +1,42 @@
+name: build-release
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+      - name: Set up JDK 16
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Cache Gradle packages
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/loom-cache
+            ~/.gradle/wrapper
+            ~/.m2/repository
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle
+
+      - run: chmod +x gradlew
+
+      - name: Build Release
+        run: ./gradlew build --stacktrace
+
+      - name: Upload artifacts to Modrinth, Curseforge and GitHub
+        uses: Kir-Antipov/mc-publish@v3.3
+        with:
+          modrinth-id: jawg7zT1
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
+          curseforge-id: 594750
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}

.github/workflows/build.yml

@@ -27,6 +27,12 @@ jobs:
         run: ref="${GITHUB_REF#refs/heads/}" && echo "::set-output name=branch::${ref////-}"
         id: ref
 
+      - name: Set outputs
+        id: vars
+        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
+      - name: Check outputs
+        run: echo ${{ steps.vars.outputs.sha_short }}
+
       - name: Validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1
 
@@ -46,5 +52,5 @@ jobs:
         if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
         with:
-          name: dust-fabric-${{ github.sha }}
+          name: dust-fabric-${{ steps.vars.outputs.sha_short }}
           path: build/libs/*[0-9].jar

.gitignore

@@ -31,3 +31,4 @@ bin/
 # fabric
 
 run/
+BackupSrc/

LICENSE

@@ -1,121 +1,373 @@
-Creative Commons Legal Code
+Mozilla Public License Version 2.0
+==================================
 
-CC0 1.0 Universal
+1. Definitions
+--------------
 
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+1.1. "Contributor"
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    means each individual or legal entity that creates, contributes to
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    the creation of, or owns Covered Software.
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
 
-Statement of Purpose
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
 
-The laws of most jurisdictions throughout the world automatically confer
+1.3. "Contribution"
-exclusive Copyright and Related Rights (defined below) upon the creator
+    means Covered Software of a particular Contributor.
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
 
-Certain owners wish to permanently relinquish those rights to a Work for
+1.4. "Covered Software"
-the purpose of contributing to a commons of creative, cultural and
+    means Source Code Form to which the initial Contributor has attached
-scientific works ("Commons") that the public can reliably and without fear
+    the notice in Exhibit A, the Executable Form of such Source Code
-of later claims of infringement build upon, modify, incorporate in other
+    Form, and Modifications of such Source Code Form, in each case
-works, reuse and redistribute as freely as possible in any form whatsoever
+    including portions thereof.
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
 
-For these and/or other purposes and motivations, and without any
+1.5. "Incompatible With Secondary Licenses"
-expectation of additional consideration or compensation, the person
+    means
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
 
-1. Copyright and Related Rights. A Work made available under CC0 may be
+    (a) that the initial Contributor has attached the notice described
-protected by copyright and related or neighboring rights ("Copyright and
+        in Exhibit B to the Covered Software; or
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
 
-  i. the right to reproduce, adapt, distribute, perform, display,
+    (b) that the Covered Software was made available under the terms of
-     communicate, and translate a Work;
+        version 1.1 or earlier of the License, but not also under the
- ii. moral rights retained by the original author(s) and/or performer(s);
+        terms of a Secondary License.
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
 
-2. Waiver. To the greatest extent permitted by, but not in contravention
+1.6. "Executable Form"
-of, applicable law, Affirmer hereby overtly, fully, permanently,
+    means any form of the work other than Source Code Form.
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
 
-3. Public License Fallback. Should any part of the Waiver for any reason
+1.7. "Larger Work"
-be judged legally invalid or ineffective under applicable law, then the
+    means a work that combines Covered Software with other material, in
-Waiver shall be preserved to the maximum extent permitted taking into
+    a separate file or files, that is not Covered Software.
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
 
-4. Limitations and Disclaimers.
+1.8. "License"
+    means this document.
 
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
+1.9. "Licensable"
-    surrendered, licensed or otherwise affected by this document.
+    means having the right to grant, to the maximum extent possible,
- b. Affirmer offers the Work as-is and makes no representations or
+    whether at the time of the initial grant or subsequently, any and
-    warranties of any kind concerning the Work, express, implied,
+    all of the rights conveyed by this License.
-    statutory or otherwise, including without limitation warranties of
+
-    title, merchantability, fitness for a particular purpose, non
+1.10. "Modifications"
-    infringement, or the absence of latent or other defects, accuracy, or
+    means any of the following:
-    the present or absence of errors, whether or not discoverable, all to
+
-    the greatest extent permissible under applicable law.
+    (a) any file in Source Code Form that results from an addition to,
- c. Affirmer disclaims responsibility for clearing rights of other persons
+        deletion from, or modification of the contents of Covered
-    that may apply to the Work or any use thereof, including without
+        Software; or
-    limitation any person's Copyright and Related Rights in the Work.
+
-    Further, Affirmer disclaims responsibility for obtaining any necessary
+    (b) any new file in Source Code Form that contains any Covered
-    consents, permissions or other rights required for any use of the
+        Software.
-    Work.
+
- d. Affirmer understands and acknowledges that Creative Commons is not a
+1.11. "Patent Claims" of a Contributor
-    party to this document and has no duty or obligation with respect to
+    means any patent claim(s), including without limitation, method,
-    this CC0 or use of the Work.
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.md

@@ -6,7 +6,7 @@ I'm glad you asked! It's just a mod that adds the white ash particle from the Ba
 
 Now to the nitty gritty:
 It works by checking if the player has the sky above them while being below sea level and then scales the amount of particles based on depth.
-<br><br>It has a config system that you can access using Mod Menu, most things you can change in-game, but to change the particle you'll need to open the config file manually :) 
+<br><br>It has a config system that you can access using Mod Menu.
 <br>
 ## Dependencies
 Cave Dust requires the [Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api) but everything else Cave Dust *needs* is included.

build.gradle

@@ -1,95 +1,71 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
+    id 'dev.architectury.loom' version '1.6-SNAPSHOT'
-	id 'maven-publish'
+    id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
 group = project.maven_group
+version = project.mod_version
+
+base {
+    archivesName = project.archives_name
+}
+
+loom {
+    forge {
+        mixinConfig 'cavedust.mixins.json'
+    }
+}
 
 repositories {
-	maven {
+    // Add repositories to retrieve artifacts from in here.
-		name = "Modrinth"
+    // You should only use this when depending on other mods because
-		url = "https://api.modrinth.com/maven"
+    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-		content {
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
-			includeGroup "maven.modrinth"
+    // for more information about repositories.
-		}
-	}
-	maven {
-		url = "https://maven.terraformersmc.com"
-	}
-	maven {
-		name = 'minelp'
-		url = 'https://repo.minelittlepony-mod.com/maven/snapshot'
-	}
-	maven {
-		name = 'minelp-release'
-		url = 'https://repo.minelittlepony-mod.com/maven/release'
-	}
-	// Add repositories to retrieve artifacts from in here.
-	// You should only use this when depending on other mods because
-	// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
-	// See https://docs.gradle.org/current/userguide/declaring_repositories.html
-	// for more information about repositories.
 }
 
 dependencies {
-	// To change the versions see the gradle.properties file
+    minecraft "net.minecraft:minecraft:$project.minecraft_version"
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:$project.yarn_mappings:v2"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    forge "net.minecraftforge:forge:$project.forge_version"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
-
-	// Fabric API. This is technically optional, but you probably want it anyway.
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
-	modApi "com.minelittlepony:kirin:${project.kirin_version}"
-	include "com.minelittlepony:kirin:${project.kirin_version}"
-
-	modCompileOnly("com.terraformersmc:modmenu:${project.modmenu_version}")
 }
 
 processResources {
-	inputs.property "version", project.version
+    inputs.property 'version', project.version
 
-	filesMatching("fabric.mod.json") {
+    filesMatching('META-INF/mods.toml') {
-		expand "version": project.version
+        expand version: project.version
-	}
+    }
-}
-
-tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
 }
 
 java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+    // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
+    // if it is present.
-	// If you remove this line, sources will not be generated.
+    // If you remove this line, sources will not be generated.
-	withSourcesJar()
+    withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
-jar {
+tasks.withType(JavaCompile).configureEach {
-	from("LICENSE") {
+    it.options.release = 17
-		rename { "${it}_${project.archivesBaseName}"}
-	}
 }
 
-// configure the maven publication
+// Configure Maven publishing.
 publishing {
-	publications {
+    publications {
-		mavenJava(MavenPublication) {
+        mavenJava(MavenPublication) {
-			from components.java
+            from components.java
-		}
+        }
-	}
+    }
 
-	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-	repositories {
+    repositories {
-		// Add repositories to publish to here.
+        // Add repositories to publish to here.
-		// Notice: This block does NOT have the same function as the block in the top level.
+        // Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
+        // The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
+        // retrieving dependencies.
-	}
+    }
 }

gradle.properties

@@ -1,20 +1,16 @@
-# Done to increase the memory available to gradle.
+# Done to increase the memory available to Gradle.
 org.gradle.jvmargs=-Xmx1G
+loom.platform = forge
 
-# Fabric Properties
+# Mod properties
-	# check these on https://fabricmc.net/develop
+mod_version = 3.0.0
-	minecraft_version=1.18.1
+maven_group = net.lizistired
-	yarn_mappings=1.18.1+build.22
+archives_name = cavedust
-	loader_version=0.13.3
 
-# Mod Properties
+# Minecraft properties
-	mod_version = 1.1.0
+minecraft_version = 1.20.4
-	maven_group = com.lizistired
+yarn_mappings = 1.20.4+build.1
-	archives_base_name = cave_dust
 
 # Dependencies
-	fabric_version=0.46.4+1.18
+forge_version = 1.20.4-49.0.50
-    clothconfig_version = 6.1.48
+architectury_version=11.1.17
-	modmenu_version = 3.0.1
-	minelp_version=4.4.0-beta.2
-	kirin_version=1.10.0-beta.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# 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.
@@ -32,10 +32,10 @@
 #       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}»,
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
+#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    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
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# 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" \
@@ -205,6 +214,12 @@ set -- \
         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.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+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

settings.gradle

@@ -1,10 +1,10 @@
 pluginManagement {
     repositories {
-        maven {
+        maven { url "https://maven.fabricmc.net/" }
-            name = 'Fabric'
+        maven { url "https://maven.architectury.dev/" }
-            url = 'https://maven.fabricmc.net/'
+        maven { url "https://files.minecraftforge.net/maven/" }
-        }
-        mavenCentral()
         gradlePluginPortal()
     }
 }
+
+rootProject.name = 'cavedust'

src/main/java/net/lizistired/cavedust/ButtonWidgetMine.java

@@ -0,0 +1,10 @@
+package net.lizistired.cavedust;
+
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.text.Text;
+
+public class ButtonWidgetMine extends ButtonWidget {
+    protected ButtonWidgetMine(int x, int y, int width, int height, Text message, PressAction onPress, NarrationSupplier narrationSupplier) {
+        super(x, y, width, height, message, onPress, narrationSupplier);
+    }
+}

src/main/java/net/lizistired/cavedust/CaveDust.java

@@ -1,68 +1,109 @@
 package net.lizistired.cavedust;
 
 //minecraft imports
+import dev.architectury.event.events.client.ClientTickEvent;
+import net.lizistired.cavedust.utils.ParticleRegistry;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.particle.Particle;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.ParticleType;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.registry.Registries;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 //other imports
-import com.minelittlepony.common.util.GamePaths;
+import net.minecraftforge.client.ConfigScreenHandler;
-import net.fabricmc.api.ClientModInitializer;
+import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.loading.FMLPaths;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 //java imports
 import java.nio.file.Path;
 //static imports
+import static net.lizistired.cavedust.CaveDust.MOD_ID;
 import static net.lizistired.cavedust.utils.MathHelper.*;
+import static net.lizistired.cavedust.utils.MathHelper.generateRandomDouble;
+import static net.lizistired.cavedust.utils.ParticleRegistry.CAVE_DUST;
+import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
 
-
+@Mod(MOD_ID)
-public class CaveDust implements ClientModInitializer {
+public class CaveDust {
 	//logger
-	public static final Logger LOGGER = LoggerFactory.getLogger("caveDust");
+	public static final String MOD_ID = "cavedust";
+	public static final Logger LOGGER = LoggerFactory.getLogger("cavedust");
 	//make class static
-	private static CaveDust instance;
-	public static CaveDust getInstance() {
-		return instance;
-	}
-	public CaveDust() {
-		instance = this;
-	}
 	//config assignment
-	private static CaveDustConfig config;
-	public CaveDustConfig getConfig() {
-		return config;
-	}
 
-	@Override
+
-	public void onInitializeClient() {
+	public static int PARTICLE_AMOUNT = 0;
-		//config path and loading
+
-		Path CaveDustFolder = GamePaths.getConfigDirectory().resolve("cavedust");
+	public static int WHITE_ASH_ID;
-		config = new CaveDustConfig(CaveDustFolder.getParent().resolve("cavedust.json"), this);
+
-		config.load();
+	public CaveDust() {
+
+		IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
+
+		ParticleRegistry.register(eventBus);
+
+		eventBus.addListener(this::clientSetup);
+
+		ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ConfigForge.SPEC, "cavedust.toml");
+		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((mc, screen) -> new CaveDustConfigScreen(Text.of("Cave Dust Config"), screen)));
 		//register end client tick to create cave dust function, using end client tick for async
-		ClientTickEvents.END_CLIENT_TICK.register(this::createCaveDust);
+
+
+		System.out.println(FMLPaths.CONFIGDIR.get().toAbsolutePath().normalize().toString());
+		ClientTickEvent.CLIENT_POST.register(CaveDust::createCaveDust);
+
+		MinecraftForge.EVENT_BUS.register(this);
 	}
 
-	private void createCaveDust(MinecraftClient client) {
+	private void clientSetup(final FMLClientSetupEvent event) {
+		WHITE_ASH_ID = Registries.PARTICLE_TYPE.getRawId(CAVE_DUST.get());
+	}
 
+	private static void createCaveDust(MinecraftClient client) {
+
+		//ensure world is not null
 		if (client.world == null) return;
 		World world = client.world;
+		//LOGGER.info(String.valueOf(((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()));
+		// )
+		double probabilityNormalized = normalize(ConfigForge.LOWER_LIMIT.get(), ConfigForge.UPPER_LIMIT.get(), client.player.getBlockY());
+		PARTICLE_AMOUNT = (int) (probabilityNormalized * ConfigForge.PARTICLE_MULTIPLIER.get() * ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.get());
 
-		if (shouldParticlesSpawn(client, config)) {
+		for (int i = 0; i < PARTICLE_AMOUNT; i++) {
-			double probabilityNormalized = normalize(config.getLowerLimit(), config.getUpperLimit(), client.player.getBlockY());
+			try {
+				int x = (int) (client.player.getPos().getX() + (int) generateRandomDouble(ConfigForge.DIMENSION_WIDTH.get() *-1, ConfigForge.DIMENSION_WIDTH.get()));
+				int y = (int) (client.player.getEyePos().getY() + (int) generateRandomDouble(ConfigForge.DIMENSION_HEIGHT.get() *-1, ConfigForge.DIMENSION_HEIGHT.get()));
+				int z = (int) (client.player.getPos().getZ() + (int) generateRandomDouble(ConfigForge.DIMENSION_WIDTH.get() *-1, ConfigForge.DIMENSION_WIDTH.get()));
+				double miniX = (x + Math.random());
+				double miniY = (y + Math.random());
+				double miniZ = (z + Math.random());
+				BlockPos particlePos = new BlockPos(x, y, z);
 
-			for (int i = 0; i < probabilityNormalized * config.getParticleMultiplier(); i++) {
+				if (shouldParticlesSpawn(client, particlePos)) {
-				try {
+					if (client.world.getBlockState(particlePos).isAir()) {
-					double x = client.player.getPos().getX() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxX());
+						world.addParticle(CaveDustConfigScreen.getParticle(), miniX, miniY, miniZ, 0, 0, 0);
-					double y = client.player.getPos().getY() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxY());
+					}
-					double z = client.player.getPos().getZ() + generateRandomDouble(config.getDimensionsMinX(), config.getDimensionsMaxZ());
-
-					world.addParticle(config.getParticle(), x, y, z, 0, 0, 0);}
-
-				catch (NullPointerException e) {
-					LOGGER.error(String.valueOf(e));
-					getConfig().setParticle("minecraft:white_ash");
 				}
 			}
+			catch (NullPointerException e) {
+				LOGGER.error(String.valueOf(e));
+				//getConfig().setParticleID(WHITE_ASH_ID);
+			}
 		}
 	}
 }

src/main/java/net/lizistired/cavedust/CaveDustConfig.java

@@ -1,107 +1,63 @@
 package net.lizistired.cavedust;
 
 import net.lizistired.cavedust.utils.JsonFile;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.registry.Registries;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 import static net.lizistired.cavedust.CaveDust.*;
+import static net.lizistired.cavedust.utils.MathHelper.*;
 
 import java.nio.file.Path;
 
 public class CaveDustConfig extends JsonFile {
-    private transient final CaveDust CaveDust;
+    private transient final net.lizistired.cavedust.CaveDust CaveDust;
 
 
-    private int dimensionMaxX = 5;
+    private int width = 10;
-    private int dimensionMaxY = 5;
+    private int height = 10;
-    private int dimensionMaxZ = 5;
+    private int velocityRandomness = 0;
-    private int dimensionMinX = -5;
-    private int dimensionMinY = -5;
-    private int dimensionMinZ = -5;
 
     private boolean caveDustEnabled = true;
-    private String particleName = "white_ash";
     private boolean seaLevelCheck = true;
+    private boolean superFlatStatus = false;
     private float upperLimit = 64;
     private float lowerLimit = -64;
-    private float particleMultiplier = 1;
+    private int particleMultiplier = 1;
 
-    public CaveDustConfig(Path file, CaveDust caveDust) {
+    private int particleMultiplierMultiplier = 10;
+
+    private int particleID = WHITE_ASH_ID;
+
+    public CaveDustConfig(Path file, net.lizistired.cavedust.CaveDust caveDust) {
         super(file);
         this.CaveDust = caveDust;
     }
 
-    public float setDimensionsMinX(float size){
+    public float setDimensionWidth(float size){
-        if (this.dimensionMinX != size) {
+        if (this.width != size) {
-            this.dimensionMinX = (int)size;
+            this.width = (int)size;
             save();
         }
-        return getDimensionsMinX();
+        return getDimensionWidth();
     }
 
-    public float setDimensionsMinY(float size){
+    public float setDimensionHeight(float size){
-        if (this.dimensionMinY != size) {
+        if (this.height != size) {
-            this.dimensionMinY = (int)size;
+            this.height = (int)size;
             save();
         }
-        return getDimensionsMinY();
+        return getDimensionHeight();
     }
 
-    public float setDimensionsMinZ(float size){
+    public float getDimensionWidth(){
-        if (this.dimensionMinZ != size) {
+        return width;
-            this.dimensionMinZ = (int)size;
-            save();
-        }
-        return getDimensionsMinZ();
     }
 
-    public float getDimensionsMinX(){
+    public float getDimensionHeight(){
-        return dimensionMinX;
+        return height;
-    }
-
-    public float getDimensionsMinY(){
-        return dimensionMinY;
-    }
-
-    public float getDimensionsMinZ(){
-        return dimensionMinZ;
-    }
-
-    public float setDimensionsMaxX(float size){
-        if (this.dimensionMaxX != size) {
-            this.dimensionMaxX = (int)size;
-            save();
-        }
-        return getDimensionsMaxX();
-    }
-
-    public float setDimensionsMaxY(float size){
-        if (this.dimensionMaxY != size) {
-            this.dimensionMaxY = (int)size;
-            save();
-        }
-        return getDimensionsMaxY();
-    }
-
-    public float setDimensionsMaxZ(float size){
-        if (this.dimensionMaxZ != size) {
-            this.dimensionMaxZ = (int)size;
-            save();
-        }
-        return getDimensionsMaxZ();
-    }
-
-    public float getDimensionsMaxX(){
-        return dimensionMaxX;
-    }
-
-    public float getDimensionsMaxY(){
-        return dimensionMaxY;
-    }
-
-    public float getDimensionsMaxZ(){
-        return dimensionMaxZ;
     }
 
     public float setUpperLimit(float upperLimit){
@@ -136,16 +92,26 @@ public class CaveDustConfig extends JsonFile {
         return lowerLimit;
     }
 
-    public float getParticleMultiplier(){
+    public int getParticleMultiplier(){
         return particleMultiplier;
     }
 
     public float setParticleMultiplier(float particleMultiplier){
-        this.particleMultiplier = particleMultiplier;
+        this.particleMultiplier = (int) particleMultiplier;
         save();
         return getParticleMultiplier();
     }
 
+    public int getParticleMultiplierMultiplier(){
+        return particleMultiplierMultiplier;
+    }
+
+    public float setParticleMultiplierMultiplier(float particleMultiplierMultiplier){
+        this.particleMultiplierMultiplier = (int) particleMultiplierMultiplier;
+        save();
+        return getParticleMultiplierMultiplier();
+    }
+
     public boolean toggleCaveDust(){
         caveDustEnabled = !caveDustEnabled;
         save();
@@ -157,19 +123,20 @@ public class CaveDustConfig extends JsonFile {
     }
 
     public ParticleEffect setParticle(String particleType){
-        particleName = particleType;
+        //particleName = particleType;
         save();
         return getParticle();
     }
 
     public ParticleEffect getParticle(){
         try {
-            return (ParticleEffect) Registry.PARTICLE_TYPE.get(Identifier.tryParse(particleName.toLowerCase()));
+            return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(getParticleID()).get().getKey().get().getValue().toString().toLowerCase()));
         } catch (ClassCastException e) {
-            LOGGER.error(e + "\nThere was an error loading the specified particle from the config, make sure a valid particle name is specified. Falling back to \"minecraft:white_ash\".");
+            MinecraftClient.getInstance().player.sendMessage(Text.translatable("debug.cavedust.particleerror"), true);
-            particleName = "minecraft:white_ash";
+            LOGGER.error("Cannot spawn particle, check config.");
+            iterateParticle();
             save();
-            return ParticleTypes.WHITE_ASH;
+            return getParticle();
         }
     }
 
@@ -183,23 +150,67 @@ public class CaveDustConfig extends JsonFile {
         return getSeaLevelCheck();
     }
 
-    public void resetConfig(){
+    public float getVelocityRandomnessRandom(){
-        dimensionMinX = -5;
+        if (velocityRandomness == 0) {return 0;}
-        dimensionMinY = -5;
+        return (float) generateRandomDouble(-velocityRandomness, velocityRandomness);
-        dimensionMinZ = -5;
+    }
 
-        dimensionMaxX = 5;
+    public float getVelocityRandomness(){
-        dimensionMaxY = 5;
+        return velocityRandomness;
-        dimensionMaxZ = 5;
+    }
+
+    public float setVelocityRandomness(float velocityRandomness){
+        this.velocityRandomness = (int) velocityRandomness;
+        save();
+        return getVelocityRandomness();
+    }
+
+    public boolean getSuperFlatStatus(){
+        return superFlatStatus;
+    }
+
+    public boolean setSuperFlatStatus(){
+        superFlatStatus = !superFlatStatus;
+        save();
+        return getSuperFlatStatus();
+    }
+
+    public void iterateParticle(){
+        if(getParticleID() > Registries.PARTICLE_TYPE.size() - 2) {
+            particleID = 1;
+            save();
+        } else {
+            particleID = getParticleID() + 1;
+            save();
+        }
+    }
+
+    public void setParticleID(int particleID){
+        this.particleID = particleID;
+        save();
+    }
+
+    public int getParticleID(){
+        if ((!Registries.PARTICLE_TYPE.getEntry(particleID).isPresent())) {
+            setParticleID(WHITE_ASH_ID);
+        }
+        return particleID;
+    }
+
+    public void resetConfig(){
+        width = 10;
+        height = 10;
 
         upperLimit = 64;
         lowerLimit = -64;
 
         particleMultiplier = 1;
+        particleMultiplierMultiplier = 10;
+        velocityRandomness = 0;
 
         seaLevelCheck = true;
         caveDustEnabled = true;
-        particleName = "minecraft:white_ash";
+        particleID = WHITE_ASH_ID;
         save();
     }
 }

src/main/java/net/lizistired/cavedust/CaveDustConfigScreen.java

@@ -0,0 +1,235 @@
+package net.lizistired.cavedust;
+
+import com.google.common.collect.Lists;
+import net.lizistired.cavedust.utils.ParticleRegistry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.Element;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.registry.Registries;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import net.minecraftforge.fml.IExtensionPoint;
+
+import java.util.List;
+import java.util.function.Supplier;
+
+public class CaveDustConfigScreen extends Screen implements IExtensionPoint {
+    private final Screen previous;
+    private final List<ButtonWidget> buttons = Lists.newArrayList();
+
+    private static final Text EXAMPLE_BUTTON = Text.translatable("menu.cavedust.examplebutton");
+
+    private final int imagewidth, imageheight;
+    private int leftpos, toppos;
+
+    private Element optionsArray[] = new Element[9];
+    public static final Identifier OPTIONS_BACKGROUND_TEXTURE = new Identifier("textures/gui/demo_background.png");
+
+
+
+    private int buttonWidth;
+
+
+
+
+    protected CaveDustConfigScreen(Text title, Screen previous) {
+        super(Text.translatable("menu.cavedust.title"));
+        this.imagewidth = 176;
+        this.imageheight = 166;
+        this.previous = previous;
+    }
+    @Override
+    public final void init(){
+        super.init();
+        this.leftpos = width / 2 - 100;
+        this.toppos = height / 4 + 14;
+        var mouseX = 0;
+        var mouseY = 0;
+
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.global." + ConfigForge.CAVE_DUST_ENABLED.get()),
+                        btn -> {
+                            ConfigForge.CAVE_DUST_ENABLED.set(!ConfigForge.CAVE_DUST_ENABLED.get());
+                            btn.setMessage(Text.translatable("menu.cavedust.global." + ConfigForge.CAVE_DUST_ENABLED.get()));
+                        }
+                ).dimensions(leftpos, toppos += -60, 200, 20).build()
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.superflatstatus." + ConfigForge.SUPERFLAT_STATUS.get()),
+                        btn -> {
+                            ConfigForge.SUPERFLAT_STATUS.set(!ConfigForge.SUPERFLAT_STATUS.get());
+                            btn.setMessage(Text.translatable("menu.cavedust.superflatstatus." + ConfigForge.SUPERFLAT_STATUS.get()));
+                        }
+                ).dimensions(leftpos, toppos += 24, 200, 20).build()
+        );
+        optionsArray[0] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.particlemultiplier"),
+                        Text.of(""),
+                        1,
+                        100,
+                        ConfigForge.PARTICLE_MULTIPLIER.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.PARTICLE_MULTIPLIER
+                )
+        );
+        optionsArray[1] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.particlemultipliermultiplier"),
+                        Text.of(""),
+                        1,
+                        100,
+                        ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER
+                )
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.particle").append(Text.literal(getNameOfParticle())),
+                        btn -> {
+                            if (ConfigForge.PARTICLE_ID.get() == Registries.PARTICLE_TYPE.size() - 1) {
+                                ConfigForge.PARTICLE_ID.set(1);
+                                btn.setMessage(Text.translatable("menu.cavedust.particle").append(Text.literal(getNameOfParticle())));
+                            } else {
+                                ConfigForge.PARTICLE_ID.set(ConfigForge.PARTICLE_ID.get() + 1);
+                                btn.setMessage(Text.translatable("menu.cavedust.particle").append(Text.literal(getNameOfParticle())));
+                            }
+                        }
+                ).dimensions(leftpos, toppos  += 24, 200, 20).build()
+        );
+        optionsArray[2] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.height"),
+                        Text.of(""),
+                        1,
+                        50,
+                        ConfigForge.DIMENSION_HEIGHT.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.DIMENSION_HEIGHT
+                )
+        );
+        optionsArray[3] = addDrawableChild(
+                new ForgeSliderButMine(
+                        leftpos,
+                        toppos += 24,
+                        200,
+                        20,
+                        Text.translatable("menu.cavedust.width"),
+                        Text.of(""),
+                        1,
+                        50,
+                        ConfigForge.DIMENSION_WIDTH.get(),
+                        1,
+                        0,
+                        true,
+                        ConfigForge.DIMENSION_WIDTH
+                )
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.reset"),
+                        btn -> resetSettings()
+                ).dimensions(leftpos, toppos += 120, 200, 20).build()
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("menu.cavedust.apply"),
+                        btn -> {
+                            applyValue(optionsArray);
+                        }
+                ).dimensions(leftpos, toppos += 24, 200, 20).build()
+        );
+        addDrawableChild(
+                ButtonWidget.builder(
+                        Text.translatable("gui.done"),
+                        btn -> {
+                            client.setScreen(this.previous);
+                            applyValue(optionsArray);
+                        }
+                ).dimensions(leftpos, toppos += 24, 200, 20).build()
+        );
+    }
+    @Override
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        this.renderBackground(context, mouseX, mouseY, delta);
+        context.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 20, 16777215);
+        super.render(context, mouseX, mouseY, delta);
+    }
+
+    //@Override
+    //public void renderBackgroundTexture(DrawContext context){
+    //    context.setShaderColor(0.25F, 0.25F, 0.25F, 1.0F);
+    //    context.drawTexture(OPTIONS_BACKGROUND_TEXTURE, 0, 0, 0, 0.0F, 0.0F, this.width, this.height, 32, 32);
+    //    context.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+    //}
+
+    private String getNameOfParticle(){
+        return Registries.PARTICLE_TYPE.getEntry(ConfigForge.PARTICLE_ID.get()).get().getKey().get().getValue().toString();
+    }
+
+    public static ParticleEffect getParticle(){
+        try {
+            return (ParticleEffect) Registries.PARTICLE_TYPE.get(new Identifier(Registries.PARTICLE_TYPE.getEntry(ConfigForge.PARTICLE_ID.get()).get().getKey().get().getValue().toString().toLowerCase()));
+        } catch (ClassCastException e) {
+            MinecraftClient.getInstance().player.sendMessage(Text.literal("Issue loading particle, defaulting to white ash particle!"), false);
+            return ParticleTypes.WHITE_ASH;
+        }
+    }
+
+    private void applyValue(Element[] optionsArray) {
+        for (Element element : optionsArray) {
+            if (element instanceof ForgeSliderButMine) {
+                ((ForgeSliderButMine) element).doTheThing();
+            }
+        }
+    }
+
+    private void resetSettings() {
+        ConfigForge.CAVE_DUST_ENABLED.set(ConfigForge.CAVE_DUST_ENABLED.getDefault());
+        ConfigForge.SUPERFLAT_STATUS.set(ConfigForge.SUPERFLAT_STATUS.getDefault());
+        ConfigForge.UPPER_LIMIT.set(ConfigForge.UPPER_LIMIT.getDefault());
+        ConfigForge.LOWER_LIMIT.set(ConfigForge.LOWER_LIMIT.getDefault());
+        ConfigForge.PARTICLE_MULTIPLIER.set(ConfigForge.PARTICLE_MULTIPLIER.getDefault());
+        ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.set(ConfigForge.PARTICLE_MULTIPLIER_MULTIPLIER.getDefault());
+        ConfigForge.DIMENSION_WIDTH.set(ConfigForge.DIMENSION_WIDTH.getDefault());
+        ConfigForge.DIMENSION_HEIGHT.set(ConfigForge.DIMENSION_HEIGHT.getDefault());
+        ConfigForge.PARTICLE_ID.set(Registries.PARTICLE_TYPE.getRawId(ParticleRegistry.CAVE_DUST.get()));
+        this.client.setScreen(this.previous);
+    }
+
+    @Override
+    public void close() {
+        this.client.setScreen(this.previous);
+    }
+
+    private ButtonWidget createButton(Text message, Supplier<Screen> screenSupplier) {
+        return ButtonWidget.builder(message, (button) -> {
+            this.client.setScreen((Screen)screenSupplier.get());
+        }).build();
+    }
+}

src/main/java/net/lizistired/cavedust/CaveDustModMenuFactory.java

@@ -1,11 +0,0 @@
-package net.lizistired.cavedust;
-
-import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import com.terraformersmc.modmenu.api.ModMenuApi;
-
-public class CaveDustModMenuFactory implements ModMenuApi {
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return net.lizistired.cavedust.ModMenuScreen::new;
-    }
-}

src/main/java/net/lizistired/cavedust/CaveDustParticleFactory.java

@@ -0,0 +1,54 @@
+package net.lizistired.cavedust;
+
+import net.minecraft.client.particle.*;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+public class CaveDustParticleFactory extends SpriteBillboardParticle {
+    public static SpriteProvider spriteProvider;
+    public CaveDustParticleFactory(ClientWorld clientWorld, double x, double y, double z, double velocityX, double velocityY, double velocityZ, SpriteProvider spriteProvider) {
+        super(clientWorld, x, y, z);
+        CaveDustParticleFactory.spriteProvider = spriteProvider; //Sets the sprite provider from above to the sprite provider in the constructor method
+        this.maxAge = 200; //20 ticks = 1 second
+        this.scale = 0.1f;
+        this.velocityX = velocityX; //The velX from the constructor parameters
+        this.velocityY = -0.007f; //Allows the particle to slowly fall
+        this.velocityZ = velocityZ;
+        this.x = x; //The x from the constructor parameters
+        this.y = y;
+        this.z = z;
+        this.collidesWithWorld = true;
+        this.alpha = 1.0f; //Setting the alpha to 1.0f means there will be no opacity change until the alpha value is changed
+        this.setSpriteForAge(spriteProvider); //Required
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+        if(this.alpha < 0.0f){
+            this.markDead();
+        }
+        this.alpha -= 0.005f;
+    }
+
+    @Override
+    public ParticleTextureSheet getType() {
+        return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT;
+    }
+
+    @OnlyIn(Dist.CLIENT)
+    public static class Factory implements ParticleFactory<DefaultParticleType> {
+        private final SpriteProvider spriteProvider;
+
+        public Factory(SpriteProvider spriteProvider) {
+            this.spriteProvider = spriteProvider;
+        }
+
+
+        public Particle createParticle(DefaultParticleType type, ClientWorld world, double x, double y, double z, double velocityX, double velocityY, double velocityZ) {
+            return new CaveDustParticleFactory(world, x, y, z, velocityX, velocityY, velocityZ, this.spriteProvider);
+        }
+    }
+}

src/main/java/net/lizistired/cavedust/ConfigForge.java

@@ -0,0 +1,76 @@
+package net.lizistired.cavedust;
+
+import net.minecraft.registry.Registries;
+import net.minecraft.text.Text;
+import net.minecraftforge.common.ForgeConfigSpec;
+
+import static net.lizistired.cavedust.CaveDust.WHITE_ASH_ID;
+
+public class ConfigForge {
+    public static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+    public static ForgeConfigSpec SPEC;
+
+    public static final ForgeConfigSpec.ConfigValue<Integer> DIMENSION_WIDTH;
+    public static final ForgeConfigSpec.ConfigValue<Integer> DIMENSION_HEIGHT;
+
+    public static final ForgeConfigSpec.BooleanValue CAVE_DUST_ENABLED;
+    public static final ForgeConfigSpec.BooleanValue SEA_LEVEL_CHECK;
+    public static final ForgeConfigSpec.BooleanValue SUPERFLAT_STATUS;
+
+    public static final ForgeConfigSpec.ConfigValue<Integer> UPPER_LIMIT;
+    public static final ForgeConfigSpec.ConfigValue<Integer> LOWER_LIMIT;
+    public static final ForgeConfigSpec.ConfigValue<Integer> PARTICLE_MULTIPLIER;
+    public static final ForgeConfigSpec.ConfigValue<Integer> PARTICLE_MULTIPLIER_MULTIPLIER;
+    public static final ForgeConfigSpec.ConfigValue<Integer> PARTICLE_ID;
+
+    //public static final ForgeConfigSpec.ConfigValue<Integer> VELOCITY_RANDOMNESS;
+    //public static final ForgeConfigSpec.ConfigValue<Double> VELOCITY_RANDOMNESS_RANDOMNESS;
+
+    static {
+        BUILDER.push("Config for Cave Dust");
+
+        //private int dimensionX = 5;
+        DIMENSION_WIDTH = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.X.tooltip")))
+                .defineInRange("dimensionX", 5, 1, 50);
+        DIMENSION_HEIGHT = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.Y.tooltip")))
+                .defineInRange("dimensionX", 5, 1, 50);
+        CAVE_DUST_ENABLED = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.enabled.tooltip")))
+                .define("caveDustEnabled", true);
+
+        SEA_LEVEL_CHECK = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.sealevelcheck.tooltip")))
+                .define("seaLevelCheck", true);
+
+        SUPERFLAT_STATUS = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.superflatstatus.tooltip")))
+                .define("superFlatStatus", false);
+
+        UPPER_LIMIT = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.upperlimit.tooltip")))
+                .defineInRange("upperLimit", 64, 0, 255);
+
+        LOWER_LIMIT = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.lowerlimit.tooltip")))
+                        .defineInRange("lowerLimit", -64, -255, 0);
+
+
+        PARTICLE_MULTIPLIER = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.particlemultiplier.tooltip")))
+                .defineInRange("particleMultiplier", 1, 1, 100);
+
+        PARTICLE_MULTIPLIER_MULTIPLIER = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.particlemultiplier.tooltip")))
+                .defineInRange("particleMultiplierMultiplier", 10, 1, 100);
+
+        PARTICLE_ID = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.particle.tooltip")))
+                .defineInRange("particleID", WHITE_ASH_ID, 0, Registries.PARTICLE_TYPE.size());
+
+        //VELOCITY_RANDOMNESS = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.velocityrandomness.tooltip")))
+        //        .defineInRange("velocityRandomness", 1, 0, 10);
+//
+        //VELOCITY_RANDOMNESS_RANDOMNESS = BUILDER.comment(String.valueOf(Text.translatable("menu.cavedust.velocityrandomness.tooltip")))
+        //        .defineInRange("velocityRandomness", generateRandomDouble(-VELOCITY_RANDOMNESS.get(), VELOCITY_RANDOMNESS.get()), 0.0d, 10.0d);
+
+
+
+
+
+        BUILDER.pop();
+        SPEC = BUILDER.build();
+    }
+
+}

src/main/java/net/lizistired/cavedust/ForgeSliderButMine.java

@@ -0,0 +1,49 @@
+package net.lizistired.cavedust;
+
+import net.minecraft.text.Text;
+import net.minecraftforge.client.gui.widget.ForgeSlider;
+import net.minecraftforge.common.ForgeConfigSpec;
+
+public class ForgeSliderButMine extends ForgeSlider {
+    long startTime = System.currentTimeMillis();
+    private int timer = 0;
+    final ForgeConfigSpec.ConfigValue<Integer> configOption;
+
+    /**
+     * @param x            x position of upper left corner
+     * @param y            y position of upper left corner
+     * @param width        Width of the widget
+     * @param height       Height of the widget
+     * @param prefix       {@link Text} displayed before the value string
+     * @param suffix       {@link Text} displayed after the value string
+     * @param minValue     Minimum (left) value of slider
+     * @param maxValue     Maximum (right) value of slider
+     * @param currentValue Starting value when widget is first displayed
+     * @param stepSize     Size of step used. Precision will automatically be calculated based on this value if this value is not 0.
+     * @param precision    Only used when {@code stepSize} is 0. Limited to a maximum of 4 (inclusive).
+     * @param drawString   Should text be displayed on the widget
+     * @param configOption
+     */
+    public ForgeSliderButMine(int x, int y, int width, int height, Text prefix, Text suffix, double minValue, double maxValue, double currentValue, double stepSize, int precision, boolean drawString, ForgeConfigSpec.ConfigValue<Integer> configOption) {
+        super(x, y, width, height, prefix, suffix, minValue, maxValue, currentValue, stepSize, precision, drawString);
+        this.configOption = configOption;
+    }
+
+    @Override
+    protected void updateMessage() {
+            setMessage(Text.literal(prefix.getString() + getValueString()));
+    }
+    @Override
+    public void applyValue(){
+
+    }
+
+    /**
+     * @deprecated bad code ignore this
+     */
+    @Deprecated
+    public void doTheThing(){
+        configOption.set((int) getValue());
+    }
+
+}

src/main/java/net/lizistired/cavedust/ModMenuScreen.java

@@ -1,97 +0,0 @@
-package net.lizistired.cavedust;
-
-import com.minelittlepony.common.client.gui.GameGui;
-import com.minelittlepony.common.client.gui.element.*;
-import net.lizistired.cavedust.utils.TranslatableTextHelper;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.TranslatableText;
-
-import javax.annotation.Nullable;
-
-public class ModMenuScreen extends GameGui {
-    public ModMenuScreen(@Nullable Screen parent) {
-        super(new TranslatableText("menu.cavedust.title"), parent);
-    }
-
-    @Override
-    public void init() {
-        int left = width / 2 - 100;
-        int row = height / 4 + 14;
-
-        CaveDustConfig config = CaveDust.getInstance().getConfig();
-        TranslatableTextHelper transText = new TranslatableTextHelper();
-        config.load();
-
-        addButton(new Label(width / 2, 30)).setCentered().getStyle()
-                .setText(getTitle());
-
-        addButton(new Button(left, row += -60).onClick(sender -> {
-            sender.getStyle().setText("menu.cavedust.global." + config.toggleCaveDust()).setTooltip(new TranslatableText("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
-        })).getStyle()
-                .setText("menu.cavedust.global." + config.getCaveDustEnabled())
-                .setTooltip(new TranslatableText("menu.cavedust.global.tooltip." + config.getCaveDustEnabled()));
-
-        addButton(new Slider(left += -110, row += 24, -50, 0, config.getDimensionsMinX()))
-                .onChange(config::setDimensionsMinX)
-                .setTextFormat(transText::formatMinX)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.minX.tooltip"));
-
-        addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinY()))
-                .onChange(config::setDimensionsMinY)
-                .setTextFormat(transText::formatMinY)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.minY.tooltip"));
-
-        addButton(new Slider(left, row += 24, -50, 0, config.getDimensionsMinZ()))
-                .onChange(config::setDimensionsMinZ)
-                .setTextFormat(transText::formatMinZ)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.minZ.tooltip"));
-
-        addButton(new Slider(left += 220, row += -48, 0, 50, config.getDimensionsMaxX()))
-                .onChange(config::setDimensionsMaxX)
-                .setTextFormat(transText::formatMaxX)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.maxX.tooltip"));
-
-        addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxY()))
-                .onChange(config::setDimensionsMaxY)
-                .setTextFormat(transText::formatMaxY)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.maxY.tooltip"));
-
-        addButton(new Slider(left, row += 24, 0, 50, config.getDimensionsMaxZ()))
-                .onChange(config::setDimensionsMaxZ)
-                .setTextFormat(transText::formatMaxZ)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.maxZ.tooltip"));
-
-        addButton(new Slider(left += -110, row += 24, -64, 319, config.getUpperLimit()))
-                .onChange(config::setUpperLimit)
-                .setTextFormat(transText::formatUpperLimit)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.upperlimit.tooltip"));
-
-        addButton(new Slider(left, row += 24, -64, 319, config.getLowerLimit()))
-                .onChange(config::setLowerLimit)
-                .setTextFormat(transText::formatLowerLimit)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.lowerlimit.tooltip"));
-
-        addButton(new Slider(left, row += 24, 0, 10, config.getParticleMultiplier()))
-                .onChange(config::setParticleMultiplier)
-                .setTextFormat(transText::formatParticleMultiplier)
-                .getStyle().setTooltip(new TranslatableText("menu.cavedust.particlemultiplier.tooltip"));
-
-
-        addButton(new Button(left, row += 24).onClick(sender -> {
-            config.resetConfig();
-            finish();
-        })).getStyle().setText(new TranslatableText("menu.cavedust.reset")).setTooltip(new TranslatableText("menu.cavedust.reset.tooltip"));
-
-        addButton(new Button(left, row += 180)
-                .onClick(sender -> finish())).getStyle()
-                .setText("gui.done");
-    }
-
-
-    @Override
-    public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) {
-        renderBackground(matrices);
-        super.render(matrices, mouseX, mouseY, partialTicks);
-    }
-}

src/main/java/net/lizistired/cavedust/mixin/ClientWorldAccessor.java

@@ -0,0 +1,12 @@
+package net.lizistired.cavedust.mixin;
+
+import net.minecraft.client.world.ClientWorld;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(ClientWorld.Properties.class)
+public interface ClientWorldAccessor {
+    @Accessor
+    boolean getFlatWorld();
+}
+

src/main/java/net/lizistired/cavedust/mixin/MixinDebugScreenOverlay.java

@@ -1,45 +1,24 @@
 package net.lizistired.cavedust.mixin;
 
-
 import net.minecraft.client.gui.hud.DebugHud;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.lang.management.BufferPoolMXBean;
-import java.lang.management.ManagementFactory;
 import java.util.List;
-import java.util.Objects;
+
-import static net.lizistired.cavedust.utils.MathHelper.*;
+import static net.lizistired.cavedust.CaveDust.PARTICLE_AMOUNT;
+import static net.lizistired.cavedust.utils.ParticleSpawnUtil.shouldParticlesSpawn;
 
 @Mixin(DebugHud.class)
 public abstract class MixinDebugScreenOverlay {
-    @Unique
-    private static final List<BufferPoolMXBean> pools = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
-
-    @Unique
-    private static final BufferPoolMXBean directPool;
-
-    static {
-        BufferPoolMXBean found = null;
-
-        for (BufferPoolMXBean pool : pools) {
-            if (pool.getName().equals("direct")) {
-                found = pool;
-                break;
-            }
-        }
-
-        directPool = Objects.requireNonNull(found);
-    }
     @Inject(method = "getRightText", at = @At("RETURN"))
-    private void appendShaderPackText(CallbackInfoReturnable<List<String>> cir) {
+    private void appendDebugText(CallbackInfoReturnable<List<String>> cir) {
         List<String> messages = cir.getReturnValue();
 
         messages.add("");
-        messages.add("Should particles spawn: " + shouldParticlesSpawn);
+        messages.add("Particle amount evaluated: " + PARTICLE_AMOUNT);
         messages.add("");
     }
 }

src/main/java/net/lizistired/cavedust/utils/MathHelper.java

@@ -1,74 +1,44 @@
 package net.lizistired.cavedust.utils;
 
-import net.lizistired.cavedust.CaveDustConfig;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.DimensionEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.OverworldBiomeCreator;
-import net.minecraft.world.dimension.DimensionType;
-import net.minecraft.world.gen.feature.OceanRuinFeature;
-
-import java.util.Objects;
-import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
 
-import static net.minecraft.world.biome.BiomeKeys.LUSH_CAVES;
-
 public class MathHelper {
-    private static float timer;
+    /**
-    public static boolean shouldParticlesSpawn;
+     * Normalizes a value to between a range, eg. you want to map a value of 100 to 0 - 1, with 50 being 0.5.
-
+     * @param min Minimum value
+     * @param max Maximum value
+     * @param val Value to be normalized
+     * @return Normalized value (double)
+     */
     public static double normalize(double min, double max, double val) {
         return 1 - ((val - min) / (max - min));
     }
 
-    public static int getRandomNumberUsingInts(int min, int max) {
+    /**
+     * Generates a random int between min and max
+     * @param min Minimum value
+     * @param max Maximum value
+     * @return Random number (int)
+     */
+    public static int generateRandomInt(int min, int max) {
         Random random = new Random();
-
         return random.ints(min, max)
                 .findFirst()
                 .getAsInt();
     }
 
-
+    /**
+     * Generates a random double between min and max
+     * @param min Minimum value
+     * @param max Maximum value
+     * @return Random number (double)
+     */
     public static double generateRandomDouble(double min, double max) {
-        return ThreadLocalRandom.current().nextDouble(min, max);
+        try {
-    }
+            return ThreadLocalRandom.current().nextDouble(min, max);
-
+        } catch (IllegalArgumentException e) {
-    public static boolean shouldParticlesSpawn(MinecraftClient client, CaveDustConfig config) {
+            return 0;
-
-        //checks if the config is enabled, if the game isn't paused, if the world is valid, if the particle is valid and if the player isn't in a lush caves biome
-        if (!config.getCaveDustEnabled()
-                || client.isPaused()
-                || client.world == null
-                || !client.world.getDimension().isBedWorking()
-                || Objects.equals(client.world.getBiomeKey(Objects.requireNonNull(client.player).getBlockPos()), Optional.of(LUSH_CAVES))
-                || Objects.requireNonNull(client.player).isSubmergedInWater())
-        {
-            timer = 0;
-            shouldParticlesSpawn = false;
-            return false;
         }
-
-        World world = client.world;
-        int seaLevel = world.getSeaLevel();
-
-        if (!client.player.clientWorld.isSkyVisible(client.player.getBlockPos())) {
-            if (client.player.getBlockPos().getY() < seaLevel){
-                timer = timer + 1;
-                if (timer > 10){
-                    timer = 10;
-                    shouldParticlesSpawn = true;
-                    return true;
-                }
-            }
-        }
-        shouldParticlesSpawn = false;
-        return false;
     }
 }

src/main/java/net/lizistired/cavedust/utils/ParticleRegistry.java

@@ -0,0 +1,22 @@
+package net.lizistired.cavedust.utils;
+
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.ParticleType;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegistryObject;
+
+import static net.lizistired.cavedust.CaveDust.MOD_ID;
+import static net.minecraftforge.registries.ForgeRegistries.Keys.PARTICLE_TYPES;
+
+public class ParticleRegistry {
+    private final static DeferredRegister<ParticleType<?>> PARTICLES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, MOD_ID);
+    public final static RegistryObject<DefaultParticleType> CAVE_DUST = PARTICLES.register("cave_dust", () -> new DefaultParticleType(false));
+
+    public static void register(IEventBus eventBus) {
+        PARTICLES.register(eventBus);
+    }
+}

src/main/java/net/lizistired/cavedust/utils/ParticleSpawnUtil.java

@@ -0,0 +1,62 @@
+package net.lizistired.cavedust.utils;
+
+import net.lizistired.cavedust.CaveDustConfig;
+import net.lizistired.cavedust.ConfigForge;
+import net.lizistired.cavedust.mixin.ClientWorldAccessor;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+import java.util.Objects;
+
+import static net.minecraft.world.biome.BiomeKeys.LUSH_CAVES;
+
+public class ParticleSpawnUtil {
+    private static float timer;
+    public static boolean shouldParticlesSpawn;
+
+    /**
+     * Returns true if particles should spawn (uses particle position instead of player).
+     * @param client MinecraftClient
+     * @param pos BlockPos
+     * @return boolean
+     */
+    public static boolean shouldParticlesSpawn(MinecraftClient client, BlockPos pos) {
+
+        //checks if the config is enabled, if the game isn't paused, if the world is valid, if the particle is valid and if the player isn't in a lush caves biome
+        if (!ConfigForge.CAVE_DUST_ENABLED.get()
+                || client.isPaused()
+                || client.world == null
+                || !client.world.getDimension().bedWorks()
+                || (client.world.getBottomY() > pos.getY())
+                //|| client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
+                || client.world.getBiome(Objects.requireNonNull(pos)).matchesKey(LUSH_CAVES))
+
+        {
+            timer = 0;
+            shouldParticlesSpawn = false;
+            return false;
+        }
+        if(!ConfigForge.SUPERFLAT_STATUS.get()) {
+            if (((ClientWorldAccessor) client.world.getLevelProperties()).getFlatWorld()) {
+                return false;
+            }
+        }
+
+        World world = client.world;
+        int seaLevel = world.getSeaLevel();
+
+        if (!client.player.clientWorld.isSkyVisible(pos)) {
+            if (pos.getY() + 2 < seaLevel){
+                timer = timer + 1;
+                if (timer > 10){
+                    timer = 10;
+                    shouldParticlesSpawn = true;
+                    return true;
+                }
+            }
+        }
+        shouldParticlesSpawn = false;
+        return false;
+    }
+}

src/main/java/net/lizistired/cavedust/utils/TranslatableTextHelper.java

@@ -1,35 +0,0 @@
-package net.lizistired.cavedust.utils;
-
-import com.minelittlepony.common.client.gui.element.AbstractSlider;
-import net.minecraft.text.Text;
-import net.minecraft.text.TranslatableText;
-
-public class TranslatableTextHelper {
-    public Text formatMinX(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.minX", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMinY(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.minY", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMinZ(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.minZ", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMaxX(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.maxX", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMaxY(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.maxY", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatMaxZ(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.maxZ", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatUpperLimit(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.upperlimit", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatLowerLimit(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.lowerlimit", (int)Math.floor(slider.getValue()));
-    }
-    public Text formatParticleMultiplier(AbstractSlider<Float> slider) {
-        return new TranslatableText("menu.cavedust.particlemultiplier", (int)Math.floor(slider.getValue()));
-    }
-}

src/main/java/net/lizistired/cavedust/utils/WindowFocusHelper.java

@@ -1,4 +1,4 @@
-package net.lizistired.caveDust.utils;
+package net.lizistired.cavedust.utils;
 
 import net.minecraft.client.MinecraftClient;
 

src/main/java/net/lizistired/cavedust/utils/event/EventBusEvents.java

@@ -0,0 +1,18 @@
+package net.lizistired.cavedust.utils.event;
+
+import net.lizistired.cavedust.CaveDust;
+import net.lizistired.cavedust.CaveDustParticleFactory;
+import net.lizistired.cavedust.utils.ParticleRegistry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.registries.RegisterEvent;
+
+@Mod.EventBusSubscriber(modid = "cavedust", bus = Mod.EventBusSubscriber.Bus.MOD)
+public class EventBusEvents {
+    @SubscribeEvent
+    public static void registerParticleTypes(final RegisterParticleProvidersEvent event) {
+        MinecraftClient.getInstance().particleManager.registerFactory(ParticleRegistry.CAVE_DUST.get(), CaveDustParticleFactory.Factory::new);
+    }
+}

src/main/resources/META-INF/mods.toml

@@ -0,0 +1,35 @@
+modLoader = "javafml"
+loaderVersion = "[49,)"
+#issueTrackerURL = ""
+license = "Mozilla Public License Version 2.0"
+
+[[mods]]
+modId = "cavedust"
+version = "${version}"
+displayName = "Cave Dust"
+authors = "LizCannotEven"
+description = '''
+This mod adds cave dust to caves!
+'''
+#logoFile = ""
+
+[[dependencies.cavedust]]
+modId = "forge"
+mandatory = true
+versionRange = "[49,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.cavedust]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.20.4,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.cavedust]]
+modId = "architectury"
+mandatory = true
+versionRange = "[11,)"
+ordering = "NONE"
+side = "BOTH"

src/main/resources/assets/cavedust/lang/en_us.json

@@ -0,0 +1,42 @@
+{
+  "menu.cavedust.title": "Cave Dust",
+  "menu.cavedust.global.false": "Cave Dust: Disabled",
+  "menu.cavedust.global.true": "Cave Dust: Enabled",
+  "menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
+  "menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
+  "menu.cavedust.width": "Width bounds: ",
+  "menu.cavedust.height": "Height bounds: ",
+  "menu.cavedust.width.tooltip": "Maximum width to spawn particle.",
+  "menu.cavedust.height.tooltip": "Maximum height to spawn particle.",
+  "menu.cavedust.upperlimit": "Upper limit height: ",
+  "menu.cavedust.lowerlimit": "Lower limit height: ",
+  "menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
+  "menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (uses player y).",
+  "menu.cavedust.reset": "Reset settings",
+  "menu.cavedust.reset.tooltip": "Are you sure you want to reset all settings?",
+  "menu.cavedust.particlemultiplier": "Particle amount: ",
+  "menu.cavedust.particlemultiplier.tooltip": "Amount of particles to spawn at any given depth.",
+  "menu.cavedust.particlemultipliermultiplier": "Particle multiplier: ",
+  "menu.cavedust.particlemultipliermultiplier.tooltip": "Multiplies particle amount.",
+  "menu.cavedust.velocityrandomness": "Velocity randomness: ",
+  "menu.cavedust.velocityrandomness.tooltip": "The randomness of the velocity of the particles.",
+  "menu.cavedust.enhanceddetection.true": "Enhanced detection: Enabled",
+  "menu.cavedust.enhanceddetection.false": "Enhanced detection: Disabled",
+  "menu.cavedust.enhanceddetection.tooltip": "Enhanced detection enables more accurate checks, using the particles position\n               instead of the player, has some performance impact.",
+  "menu.cavedust.superflatstatus.true": "Superflat particles: Enabled",
+  "menu.cavedust.superflatstatus.false": "Superflat particles: Disabled",
+  "menu.cavedust.superflatstatus.tooltip": "Should particles spawn on superflat worlds?",
+  "menu.cavedust.particle": "Particle: ",
+  "menu.cavedust.particle.tooltip": "Particle to spawn. Click to cycle.",
+  "menu.cavedust.apply": "Apply",
+
+  "key.cavedust.reload": "Reload Config",
+  "key.cavedust.toggle": "Toggle Particles",
+  "category.cavedust.spook": "Cave Dust",
+
+  "debug.cavedust.toggle.true": "(Cave Dust) Enabled particles",
+  "debug.cavedust.toggle.false": "(Cave Dust) Disabled particles",
+  "debug.cavedust.reload": "(Cave Dust) Reloaded config",
+  "debug.cavedust.particleerror": "(Cave Dust) Error setting particle, skipping to next particle!"
+
+}

src/main/resources/assets/cavedust/particles/cave_dust.json

@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "minecraft:generic_0"
+  ]
+}

src/main/resources/assets/modid/lang/en_us.json

@@ -1,27 +0,0 @@
-{
-  "menu.cavedust.title": "Cave Dust",
-  "menu.cavedust.global.false": "Cave Dust: Disabled",
-  "menu.cavedust.global.true": "Cave Dust: Enabled",
-  "menu.cavedust.global.tooltip.false": "Enable cave dust particles?",
-  "menu.cavedust.global.tooltip.true": "Disable cave dust particles?",
-  "menu.cavedust.minX": "Minimum X: %s",
-  "menu.cavedust.minY": "Minimum Y: %s",
-  "menu.cavedust.minZ": "Minimum Z: %s",
-  "menu.cavedust.maxX": "Maximum X: %s",
-  "menu.cavedust.maxY": "Maximum Y: %s",
-  "menu.cavedust.maxZ": "Maximum Z: %s",
-  "menu.cavedust.minX.tooltip": "Minimum X: %s",
-  "menu.cavedust.minY.tooltip": "Minimum Y: %s",
-  "menu.cavedust.minZ.tooltip": "Minimum Z: %s",
-  "menu.cavedust.maxX.tooltip": "Maximum X: %s",
-  "menu.cavedust.maxY.tooltip": "Maximum Y: %s",
-  "menu.cavedust.maxZ.tooltip": "Maximum Z: %s",
-  "menu.cavedust.upperlimit": "Upper limit: %s",
-  "menu.cavedust.lowerlimit": "Lower limit: %s",
-  "menu.cavedust.upperlimit.tooltip": "The height where particles will fade out and stop spawning (uses player y).",
-  "menu.cavedust.lowerlimit.tooltip": "The height where particles spawn the most (uses player y).",
-  "menu.cavedust.reset": "Reset settings",
-  "menu.cavedust.reset.tooltip": "Are you sure you want to reset all settings?",
-  "menu.cavedust.particlemultiplier": "Particle multiplier: %s",
-  "menu.cavedust.particlemultiplier.tooltip": "Multiplies the amount of particles at any given depth."
-}

src/main/resources/cavedust.mixins.json

@@ -4,6 +4,8 @@
   "package": "net.lizistired.cavedust.mixin",
   "compatibilityLevel": "JAVA_16",
   "mixins": [
+    "ClientWorldAccessor",
+    "MixinDebugScreenOverlay"
   ],
   "client": [
   ],

src/main/resources/fabric.mod.json

@@ -1,44 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "cavedust",
-  "version": "${version}",
-  "name": "Cave Dust",
-  "description": "Makes dust underground that scales with depth!",
-  "authors": [
-    "LizIsTired"
-  ],
-  "contact": {
-    "issues": "https://github.com/LizIsTired/dust/issues",
-    "sources": "https://github.com/LizIsTired/dust"
-  },
-  "license": "CC0-1.0",
-  "icon": "assets/modid/icon.png",
-  "environment": "*",
-  "entrypoints": {
-    "client": [
-      "net.lizistired.cavedust.CaveDust"
-    ],
-    "modmenu": [
-      "net.lizistired.cavedust.CaveDustModMenuFactory"
-    ]
-  },
-  "mixins": [
-    "dust.mixins.json"
-  ],
-  "depends": {
-    "fabricloader": ">=0.12.11",
-    "fabric": "*",
-    "minecraft": "1.18.x",
-    "java": ">=17"
-  },
-  "suggests": {
-    "modmenu": ">=3.0.1"
-  },
-  "custom": {
-    "modmenu": {
-      "links": {
-        "modmenu.discord": "https://discord.gg/AgBfPFMJgX"
-      }
-    }
-  }
-}

src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "description": "Cave Dust",
+    "pack_format": 22
+  }
+}