Updated the code to latest 0.8.1 mod version + updated/downgraded the code to 1.21.4

Author: MikiP98

.gitignore

@@ -3,6 +3,12 @@
 generated/
 src/main/generated/
 
+src/main/resources/resourcepacks/alternate_wooden_mosaic_recipies/data
+src/main/resources/resourcepacks/alternate_wooden_mosaic_recipies/data/*
+src/main/resources/resourcepacks/alternate_wooden_mosaic_recipies/data/**
+src/main/resources/resourcepacks/alternate_wooden_mosaic_recipies/data/humility-afm/recipes
+src/main/resources/resourcepacks/alternate_wooden_mosaic_recipies/data/humility-afm/recipes/*
+src/main/resources/resourcepacks/alternate_wooden_mosaic_recipies/data/humility-afm/recipes/**
 
 
 # Python

README.md

@@ -5,10 +5,10 @@
 ## Description
 This is a simple and small mod that adds some simple decorative blocks such as cabinets (which are fancier types of item frames) as well as some vanilla block variations.
 <br>
-It specializes in procedurally generating variants of the same block so that you can always find the look you were searching for.
+It specialises in procedurally generating variants of the same block so that you can always find the look you were searching for.
 
 ### Download
-The only official downloads are from [**Modrinth**](https://modrinth.com/mod/humility-afm/versions) and [Github](https://github.com/MikiP98/HumilityAFM)  
+The only official downloads are from [**Modrinth**](https://modrinth.com/mod/humility-afm/versions) and [GitHub](https://github.com/MikiP98/HumilityAFM)  
 I can't ensure any other downloads are safe and don't include viruses  
 PLS download the mod from Modrinth if you can
 
@@ -84,64 +84,66 @@ Lighten up your builds with unobtrusive light source
 
 ## Roadmap:
 
-### Done in the development version:
-
-- ~~Fix long block breaking caused by mining tag failure when not all features are enabled~~
-- ~~Add Standing Candlestick variants~~
-- ~~Add floor and ceiling variants of the cabinets~~
-- ~~Convert all the Python code to Java Fabric Datagen~~
-- ~~Restructure the code a bit *(e.g. dedicated registry files)*~~
-- ~~Add `Fully resourcepack compatible!` to the `Features` section in the readme~~
-- ~~Compress candlesticks into 4 items for each metal type~~
-- ~~Move VoxelShapes from switches to maps or variables~~
-- ~~Fix Light Strips loosing their Block Entity~~
-- ~~Fix Light Strip brightening breaking on corner pieces~~
-- ~~Fix Light Strip voxel shape~~
-- ~~Fix candlestick waterlog ability~~
-- ~~Improve Cabinet rendering~~
-- ~~Improve config logic~~
-- ~~Fix Cabinet open and close models not matching and cabinet inside texture stretch~~
-- ~~De-separate the particle texture from the block texture in cabinets and others~~
-- ~~Make Redstone Jack o'Lanterns to turn off when powered~~
-- ~~Make Soul Jack o'Lanterns special in some way (for now particles)~~
-- ~~Port to newer MC versions:~~
-  - ~~1.20.4~~
-  - ~~1.20.6~~
-  - ~~1.21.1~~
-- ~~Add coloured torches:~~
-  - ~~`LED powder` into `Glowing powder`~~
-  - ~~1 powder - weak torch; 2 powders - torch; 3 powders - strong torch~~
-  - ~~Move LEDs to misc tab, alongside the powders~~
-  - ~~Rename LEDs to light strips, consider enabling them by default?~~
-  - ~~Make coloured Jack o'Lanterns~~
-  - ~~Finish coloured torches and jack o'Lanterns textures~~
-  - ~~Fix built-in cabinet resourcepacks~~
+### Done:
+
+- Add special built-in mod support for:
+  - BetterNether
+  - BetterEnd
+  - Biomes o' Plenty
+- Fix nether wood block variants burning
+- Move duplicated code to Interfaces (candlesticks)
+- Reworked the whole block generation system
+- Add an optional datapack with alternate, non crafting-table colliding, wooden mosaic recipes
+  - This datapack will be disabled by default on MC versions from 1.20.1 (included) to 1.21.4 (excluded)
+  - From 1.21.4 onwards, the datapack will be enabled by default because of `polymorph` mod's absence
 
 ### High priority:
 
-- Rethink the README structure
 - Redo the window capture screenshots or at least crop the window app bar
-- Fix Cabinet breaking animation being invisible:
+- Fix Cabinet breaking animation being invisible
   - Make sure all other breaking animations are also visible
-
-
-### Medium priority:
-
 - Finish built-in jack o'Lantern rp compat resourcepack
 - Finish built-in coloured torches rp compat resourcepack
-- Improve the speciality of Soul Jack o'Lantern :/
 - Add 'Shimmer' and 'Bliss' support for all the blocks from coloured feature set:
   - Coloured Torches
   - Coloured Jack o'Lanterns
   - Light Strips
+- Add Illuminated Cabinet Brightening to the config
+- Add PBR data to:
+  - Cabinet front texture:
+    - LabPBR specular (pixels only)
+    - Optional resourcepacks for:
+      - LabPBR specular (full texture)
+  - Jack o'Lanterns textures:
+    - vanilla emission (coloured face only)
+    - LabPBR emission (coloured face only)
+    - Optional resourcepacks for:
+      - vanilla emission (full texture)
+      - LabPBR emission (full texture)
+- Redo coloured torch textures using the Jack o'Lantern palette system
+- Reduce the number of coloured torches and jack o'Lanterns
+  - Think of a system that can replace the current 3 blocks per colour with different light output levels
+- Improve the built-in mod support for:
+  - BetterNether
+  - BetterEnd
+  - Biomes o' Plenty
+  - Add stone variants from the above mods, and fix the missing wood variants
+- Add special built-in mod support for:
+  - DivineRPG
+  - Couple other mods with custom wood types
+- Move duplicated code to Interfaces (cabinet block entity renderers)
+
+### Medium priority:
+
+- Improve the speciality of Soul Jack o'Lantern :/
+  - Make them work as bookshelves for enchanting?
+  - Make them boost monster spawners?
+  - Make them scare away Endermen or other mobs?
 - Add Fancy carpets
 - Add hanging pots
 - Add hanging candlesticks
 - Add more candlestick variants:
   - small, medium, large, etc.
-- Re-add Better Nether built-in support
-- Add Better End built-in support
-- Add Biomes o' Plenty built-in support
 - Add correct map colours to generated blocks:
   - Cabinets and Illuminated Cabinets
   - Candlesticks
@@ -153,27 +155,14 @@ Lighten up your builds with unobtrusive light source
   - Forced Corner Stairs
 - Rethink cabinet opening, item insertion and removal, and such
 - Add the ability to rotate items displayed in the cabinets
-- Fix nether wood block variants burning
-- Add Illuminated Cabinet Brightening to the config
-- Port to newer MC versions:
-  - 1.21.4 *(need to wait for 'polymorph')*
 - Expand Light Stips:
   - Vertical mount
   - Fit multiple Light Strips in 1 block
 - Make coloured flame particles for coloured torches
-- Add PBR data to:
-  - Cabinet front texture:
-    - LabPBR specular (pixels only)
-    - Optional resourcepacks for:
-      - LabPBR specular (full texture)
-  - Jack o'Lanterns textures:
-    - vanilla emission (coloured face only)
-    - LabPBR emission (coloured face only)
-    - Optional resourcepacks for:
-      - vanilla emission (full texture)
-      - LabPBR emission (full texture)
-- Redo coloured torch textures using Jack o'Lantern palette system
-
+- Improve the sounds by varying the pitch and volume slightly
+- Optimise the model datagen
+- Convert the config from JSON to TOML
+- Consider making Polymorph an optional dependency, now with the alternative wooden mosaic recipie datapack it is no longer needed, that said people might still be confused if they didn't have either enabled/installed
 
 ### Low/unknown priority:
 
@@ -182,8 +171,6 @@ Lighten up your builds with unobtrusive light source
 - Add carpet covered stairs?
 - Server feature sync?
   - If done through a datapack, the blocks can be enabled by default on the client?
-- Port to newer MC versions:
-  - 1.21.5? *(need to wait for 'polymorph')*
 - Backport to older MC versions?:
   - 1.19.2?
   - 1.18.2?
@@ -193,14 +180,10 @@ Lighten up your builds with unobtrusive light source
   - 1.7.10?
   - 1.0?
 - Add crafting table on a stick?:
-  - If the right-clicked block has a recipie that requires only itself and output only 1 other block, it will replace the right-clicked block with the output block from that recipe
+  - If the right-clicked block has a recipe that requires only itself and outputs only one other block, it will replace the right-clicked block with the output block from that recipe
 - Add variant choosing block?:
   - A GUI block that will show all the variants that can be crafted in the crafting table following the *crafting table on a stick* logic, and it will allow you to choose the variant you want to craft
-  - Should be really useful for candlesticks if they would get a lot of variants
-- Make Light Strips and Candlesticks into integrated datapacks?:
-  - Because of new tag system, the vanilla tool tags should no longer break, so at most this will fix the console spam with disabled features 
-- Make BetterNether and BetterEnd support into integrated datapacks?
-  - Because of new tag system, the vanilla tool tags should no longer break, so at most this will fix the console spam with disabled features
+  - It Should be really useful for candlesticks if they get a lot of variants
 - Consider doing a HumilityLib library mod for config or such?
 - Improve Illuminated Cabinet Brightening rendering?
 - Add thin <sup>*(Blibiocraft style)*</sup> and short cabinets?
@@ -215,9 +198,9 @@ Lighten up your builds with unobtrusive light source
 **A:** Depends, I'm interested in supporting multiple MC versions, but can't support all of them.  
 If you want support for specific MC version pls create an [issue on GitHub](https://github.com/MikiP98/HumilityAFM/issues)
 
-**Q:** Can you port to mod to forge?
+**Q:** Can you port to mod to forge?  
 **A:** I wanted this to be a forge mod, but I just could get even the empty template to work and I gave up.  
-I'm not planing on porting the mod myself, but if you are interested in porting it yourself, you can, pls let me know of such projects on Github :)  
+I'm not planing on porting the mod myself, but if you are interested in porting it yourself, you can, pls let me know of such projects on GitHub :)  
 You can also use the mod [Kilt](https://github.com/KiltMC/Kilt) to run forge mods on fabric
 
 **Q:** Why don’t I see *Light Strips* / *Coloured Torches* / *Coloured Jack o'Lanterns* in my game?  
@@ -226,8 +209,8 @@ You can also use the mod [Kilt](https://github.com/KiltMC/Kilt) to run forge mod
 **Q:** Why don’t my *Light Strips* / *Coloured Torches* / *Coloured Jack o'Lanterns* emit coloured light?  
 **A:** For coloured lighting you need a separate compatible mod or shader. For now this includes [**Bliss** shader](https://github.com/MikiP98/Bliss-Shader) and [**Shimmer** mod](https://modrinth.com/mod/shimmer!)  
   If the light sources still don't emmit coloured light:  
-  When using Shimmer mod, there is probably some mod incompatibility. Try disabling the 'NVIDIUM' mod if present and it should start working again, if 'NVIDIUM' is not the causem try asking in Shimmer DC server for help  
-  When using Bliss shader, make sure to load it via [Iris](https://modrinth.com/mod/iris) or [Oculus](https://modrinth.com/mod/oculus) and __***not***__ using **Optifine**! Then make sure floodfill option is enabled in the shader settings
+  When using **Shimmer** mod, there is probably some mod incompatibility. Try disabling the 'NVIDIUM' mod if present and it should start working again, if 'NVIDIUM' is not the cause try asking in Shimmer DC server for help  
+  When using **Bliss** shader, make sure to load it via [Iris](https://modrinth.com/mod/iris) or [Oculus](https://modrinth.com/mod/oculus) and __***not***__ using **Optifine**! Then make sure floodfill option is enabled in the shader settings
 
 **Q:** Why is the inside of Cabinets transparent?  
 **A:** Sodium <0.6.0 has issues with rendering transparency. You can try replacing it with Embeddium or installing other mods, like NVIDIUM, may help fix the problem. If that doesn't help, you can disable partial Cabinet transparency in the configuration (you will still be able to see the items inside)
@@ -238,4 +221,38 @@ You can also use the mod [Kilt](https://github.com/KiltMC/Kilt) to run forge mod
 <br>
 
 
+## Versioning:
+
+### `{major}.{minor}.{patch}.{mc_version_specific_patch}`
+- `major` - Big changes, possibly breaking backward compatibility
+- `minor` - New features, but backward compatible
+- `patch` - Bug fixes, optimizations, small changes
+- `mc_version_specific_patch` - Patches (see above) exclusive to specific to a Minecraft version release
+
+Note that features marked as *beta* may change or be removed even in minor updates,
+breaking their backward compatibility
+
+<br>
+
+
+## Building instructions:
+
+1. Download the source code from [GitHub](https://github.com/MikiP98/HumilityAFM)
+2. Download the dependent mods for datagen and put them under `./build/datagen/mods/`
+   - [**Better End**](https://modrinth.com/mod/betterend)
+   - [**Better Nether**](https://modrinth.com/mod/betternether)
+   - [**Biomes o' Plenty**](https://modrinth.com/mod/biomes-o-plenty)
+   - *Dependencies of the above mods*
+3. Run command `./gradlew runDatagen` or `gradlew runDatagen` in the terminal
+    - When the command fails, enable `datagenMode` in the config file under `./build/datagen/config/humility-afm.json`
+4. Move the content *(the inside of the folder)* of `src/main/generated/data/humility-afm/recipies/datapack` to `src/main/resources/resourcepacks/alternate_wooden_mosaics_recipes/data/humility-afm/recipies/`
+5. Move the content *(the inside of the folder)* of `src/main/generated/data/humility-afm/advancements/recipes/misc/datapack` to `src/main/resources/resourcepacks/alternate_wooden_mosaics_recipes/data/humility-afm/advancements/recipes/misc/`
+6. Run command `./gradlew build` or `gradlew build` in the terminal
+7. The compiled mod jar should be located in `./build/libs/` folder
+
+[//]: # (TODO: Create a script to automate the above steps, or at least step 4)
+
+<br>
+
+
 *Checkout my [other mods](https://modrinth.com/user/Miki-Liki) :)*

build.gradle

@@ -3,7 +3,7 @@ plugins {
 	id 'maven-publish'
 }
 
-version = project.mod_version
+version = "${project.mod_version}-mc${project.minecraft_version}"
 group = project.maven_group
 
 base {
@@ -32,11 +32,11 @@ repositories {
 		}
 	}
 
-	// Required for 'polymorph'
-	maven {
-		name = 'Ladysnake Mods'
-		url = 'https://maven.ladysnake.org/releases'
-	}
+	// Required for 'polymorph' (see 'dependencies' to know why commented out)
+//	maven {
+//		name = 'Ladysnake Mods'
+//		url = 'https://maven.ladysnake.org/releases'
+//	}
 }
 
 loom {
@@ -51,12 +51,16 @@ loom {
 }
 
 fabricApi {
-	configureDataGeneration {
+	configureDataGeneration() {
 		client = true
 	}
 }
 
 dependencies {
+	// Lombok for annotations like @Getter, @Setter, etc.
+	compileOnly 'org.projectlombok:lombok:1.18.32'
+	annotationProcessor 'org.projectlombok:lombok:1.18.32'
+
 	// To change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
@@ -100,7 +104,7 @@ java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
-	withSourcesJar()
+	// withSourcesJar()
 
 	sourceCompatibility = JavaVersion.VERSION_21
 	targetCompatibility = JavaVersion.VERSION_21

gradle.properties

@@ -4,21 +4,20 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.6
-yarn_mappings=1.21.6+build.1
-loader_version=0.16.14
-loom_version=1.10-SNAPSHOT
-# TODO: Update to look 1.11-SNAPSHOT
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
 
 # Mod Properties
-mod_version=0.7.0
+mod_version=0.8.1
 maven_group=io.github.mikip98.humilityafm
 archives_base_name=humility-afm
 
 # Dependencies
-fabric_version=0.128.2+1.21.6
-config2_version=19.0.147
-modmenu_version=15.0.0-beta.3
+fabric_version=0.119.2+1.21.4
+config2_version=17.0.144
+modmenu_version=13.0.3
 
 # As of now, Polymorph has not updated past 1.21.1
 ## Polymorph runtime

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME