Port to 1.21.1

.gitattributes

@@ -1,2 +1,15 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+* text eol=lf
+*.bat text eol=crlf
+*.patch text eol=lf
+*.java text eol=lf
+*.gradle text eol=crlf
+*.png binary
+*.gif binary
+*.exe binary
+*.dll binary
+*.jar binary
+*.lzma binary
+*.zip binary
+*.pyd binary
+*.cfg text eol=lf
+*.jks binary

.github/workflows/PUBLISH.yml

@@ -1,10 +1,10 @@
 name: Publish on GitHub, Modrinth, CurseForge
 
-on: [ workflow_dispatch ]
+on: [workflow_dispatch]
 
 env:
-  MINECRAFT_VERSION: 1.20.1
-  JAVA_VERSION: 17
+  MINECRAFT_VERSION: 1.21.1
+  JAVA_VERSION: 21
   VERSION: 0.2.4
   VERSION_TYPE: release
   PUBLISH_GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }}
@@ -55,17 +55,15 @@ jobs:
           curseforge-id: 1000148
           curseforge-token: "${{env.PUBLISH_CURSEFORGE_TOKEN}}"
 
-          name: "Create: Addon Compatibility - v${{env.VERSION}} - ${{env.MINECRAFT_VERSION}} - (neo)forge"
+          name: "Create: Addon Compatibility - v${{env.VERSION}} - Neoforge - ${{env.MINECRAFT_VERSION}}"
           version: "${{env.VERSION}}"
           version-type: "${{env.VERSION_TYPE}}"
           changelog-file: LATEST_CHANGELOG.md
           game-version-filter: releases
 
-          loaders: |
-            forge
-            neoforge
+          loaders: neoforge
 
-          files: "build/libs/createaddoncompatibility-${{env.VERSION}}.jar"
+          files: "neoforge/build/libs/createaddoncompatibility-neoforge-${{env.MINECRAFT_VERSION}}-${{env.VERSION}}.jar"
 
           dependencies: |
             create(required){modrinth:create}{curseforge:328085}#(ignore:github)

.gitignore

@@ -11,21 +11,15 @@ out
 *.ipr
 *.iws
 *.iml
-.idea
+.idea/*
+!.idea/scopes
 
 # gradle
 build
 .gradle
 
 # other
+.cache
 eclipse
 run
-run-data
-.cache
-*.vscode
-*.zip
-*.mrpack
-*.exe
-
-# Files from Forge MDK
-forge*changelog.txt
+runs

MC_VERSION_DIFFERENCES.md

@@ -0,0 +1,7 @@
+# Differences in the Mod Between Minecraft Versions
+
+## Compatibilities NOT Ported to 1.21.1
+
+- Coal Coke Dust
+- Six Way Gearbox - Create Utilities hasn't updated to Minecraft 1.21.1
+- Ad Astra and CSnR - These mods haven't updated to Minecraft 1.21.1

README.md

@@ -4,83 +4,58 @@
 
 ### Blocks/Items
 
-<details>
-<summary>Copycats</summary>
-
-Mods: [Create: Copycats+](https://modrinth.com/mod/copycats), [Create: Connected](https://modrinth.com/mod/create-connected), [CD&D](https://modrinth.com/mod/create-dreams-and-desires) <br> 
-Copycats+ takes priority, all copycats from the other mods are hid in JEI/REI/EMI. <br>
-</details>
-
-<details>
-<summary>Plastic Sheet</summary>
-
-Mods: [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg) <br>
-Pneumaticcraft takes priority, recipes have been unified, TFMG's plastic sheet is hid in JEI/REI/EMI. <br>
-</details>
-
-<details>
-<summary>Six Way Gearbox</summary>
-
-Mods: [Create: Connected](https://modrinth.com/mod/create-connected), [Create Utilities](https://modrinth.com/mod/create-utilities)<br>
-Create: Connected takes priority, recipes have been unified, Create Utilities's Gearcube is hid in JEI/REI/EMI. <br>
-</details>
-
-<details>
-<summary>Coal Coke Dust</summary>
-
-Mods: [Immersive Engineering](https://modrinth.com/mod/immersiveengineering), [TFMG](https://modrinth.com/mod/create-tfmg)<br>
-Coal Coke Dust from both mods works in both mods' processes and recipes.
-</details>
-<br>
+The following blocks/items have been unified to work in all the processes and recipes present in the relevant mods.
+
+Mods take priority as defined in the configuration section below, items from lower priority mods are hidden in JEI/REI/EMI.
+
+- **Coal Coke Dust** - [Immersive Engineering](https://modrinth.com/mod/immersiveengineering), [TFMG](https://modrinth.com/mod/create-tfmg)
+- **All Copycat Blocks** - [Create: Copycats+](https://modrinth.com/mod/copycats), [Create: Connected](https://modrinth.com/mod/create-connected), [CD&D](https://modrinth.com/mod/create-dreams-and-desires)
+- **Plastic Sheet** - [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg)
+- **Six Way Gearbox** - [Create: Connected](https://modrinth.com/mod/create-connected), [Create Utilities](https://modrinth.com/mod/create-utilities)
 
 ### Fluids
 
-<details>
-<summary>Crude Oil</summary>
-
-Mods: [Ad Astra](https://modrinth.com/mod/ad-astra), [CDG](https://modrinth.com/mod/create-diesel-generators), [C:L&W](https://modrinth.com/mod/create-love-war), [Destroy](https://modrinth.com/mod/destroy), [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg) <br>
-Crude Oil from all these mods works in all distillation processes requiring it present in these mods.<br>
-</details>
-
-<details>
-<summary>Fuels</summary>
-
-Mods: [Ad Astra](https://modrinth.com/mod/ad-astra), [CC&A](https://modrinth.com/mod/createaddition), [CDG](https://modrinth.com/mod/create-diesel-generators), [CSnR](https://modrinth.com/mod/create-steam-n-rails), [Destroy](https://modrinth.com/mod/destroy), [Create Garnished](https://modrinth.com/mod/create-garnished), [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg)<br>
-Various fuels from these mods work in rockets of Ad Astra.(Can be disabled, see configuration section)<br>
-Various fuels from these mods work in various processes and recipes of CC&A.<br>
-Various fuels from these mods work in CDG's Diesel Generators.<br>
-Various fuels from these mods work in various processes and recipes of Pneumaticcraft.<br>
-Various fuels from these mods work in CSnR's trains.<br>
-Currently only TFMG's fuels work in its generators as TFMG does not have support for custom fuel types.(_A work-around could be found._)<br>
-</details>
-
-<details>
-<summary>Kerosene, Molten/Liquid Plastic, Lubricant/Lubrication Oil</summary>
-
-Mods: [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg)<br>
-Kerosene, Molten/Liquid Plastic, Lubricant/Lubrication Oil from both mods works in both mods' processes and recipes.
-</details>
-
-<br><br>
+The following fluids have been unified to work in all the processes and recipes present in the relevant mods.
+
+- **Crude Oil** - [Ad Astra](https://modrinth.com/mod/ad-astra), [CDG](https://modrinth.com/mod/create-diesel-generators), [C:L&W](https://modrinth.com/mod/create-love-war), [Destroy](https://modrinth.com/mod/destroy), [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg)
+- **Fuels** - [Ad Astra](https://modrinth.com/mod/ad-astra), [CC&A](https://modrinth.com/mod/createaddition), [CDG](https://modrinth.com/mod/create-diesel-generators), [CSnR](https://modrinth.com/mod/create-steam-n-rails), [Destroy](https://modrinth.com/mod/destroy), [Create Garnished](https://modrinth.com/mod/create-garnished), [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg)
+  - Compatibility for fuels from other mods working in Ad Astra rockets can be disabled by enabling a datapack included in the mod.
+  - Currently only TFMG's fuels work in its generators as TFMG does not have support for custom fuel types.(_A work-around could be found._)
+- **Kerosene, Molten/Liquid Plastic, Lubricant/Lubrication Oil** - [Pneumaticcraft](https://modrinth.com/mod/pneumaticcraft-repressurized), [TFMG](https://modrinth.com/mod/create-tfmg)
 
 ## Installation
-The mod is currently only available for 1.20.1 (neo)forge. Fabric/Quilt versions and >=1.21.1 versions will come soon. A port to 1.19.2 is not planned.<br>
-[Almost Unified](https://modrinth.com/mod/almost-unified) is required to be installed.<br>
-<br><br>
+
+The mod is currently only available for 1.20.1 and 1.21.1 (neo)forge. Fabric/Quilt versions will come soon.
+
+[Almost Unified](https://modrinth.com/mod/almost-unified) and [Create](https://modrinth.com/mod/create) are required to be installed.
 
 ## Compatibility Configuration
+
 To change which mod has the priority in compatibility, modify the `modPriorities` in `config/almostunified/unify.json`, for more info look at [this](https://github.com/AlmostReliable/almostunified/wiki/Unification-Config).
-<br><br>
-There are datapacks present in the mod which allow you to change certain things about compatibility between different mods.<br>
-They can be enabled during world creation or by using the ``/datapack enable`` command.
-<br><br>
+
+The default priority order from highest to lowest is
+
+```
+pneumaticcraft
+copycats
+create_connected
+create_dd
+tfmg
+```
+
+<br>
+
+There are datapacks present in the mod which allow you to change certain things about compatibility between different mods.
+
+They can be enabled during world creation or by using the `/datapack enable` command.
 
 ## Suggestions / More Compatibility Features
-I do have more compatibility features planned, but if you have any ideas feel free to create an issue on GitHub or tell me in the Discord server.
 
-<br><br>
+I do have more compatibility features planned, but if you have any ideas, feel free to create an issue on GitHub or tell me in the Discord server.
 
 ## Credits
-Thanks to the creators of the various mods for which compatibility has been added in this mod.<br>
-Thanks to the AlmostReliable team for making Almost Unified, without which this mod would have been very difficult to make.<br>
-Finally, thanks to the people on the Minecraft Mod Development discord for helping me out with some features in the mod.
+
+Thanks to:
+
+1. The creators of the various mods for which compatibility has been added in this mod.
+2. The AlmostReliable team for making Almost Unified, without which this mod would have been very difficult to make.