From 17db96153bd0d55265a057361196d0a7d7c92027 Mon Sep 17 00:00:00 2001
From: D4RKAR117 <D4RKAR117@outlook.es>
Date: Fri, 14 Jun 2024 17:21:55 -0500
Subject: [PATCH] feat(version): ported to mc 1.21

---
 .idea/codeStyles/Project.xml                  |   2 +-
 gradle.properties                             |  16 +-
 .../103d9f3f36b01595f1aa5172191e60eff02e6924  |   2 +-
 .../289dbcd3e460bdbdb8ac17aa123e59a5f92a086d  |  50 +--
 .../429a0e16dedc2e58d71866b4ee086752689880a7  |   4 +-
 .../f9f5b962781cbf5adcc0a5f1bb62946a57aa0390  |   2 +-
 .../fbf9d452c21740c3571315e0cdc4a0c2a56d2ed0  |   2 +-
 .../data/c/tags/{blocks => block}/ores.json   |   0
 .../tags/{blocks => block}/ores/bauxite.json  |   0
 .../{blocks => block}/ores/beryllium.json     |   0
 .../tags/{blocks => block}/ores/cadmium.json  |   0
 .../tags/{blocks => block}/ores/chromium.json |   0
 .../c/tags/{blocks => block}/ores/cobalt.json |   0
 .../tags/{blocks => block}/ores/graphite.json |   0
 .../tags/{blocks => block}/ores/iridium.json  |   0
 .../tags/{blocks => block}/ores/lithium.json  |   0
 .../{blocks => block}/ores/manganese.json     |   0
 .../{blocks => block}/ores/molybdenum.json    |   0
 .../c/tags/{blocks => block}/ores/nickel.json |   0
 .../c/tags/{blocks => block}/ores/osmium.json |   0
 .../{blocks => block}/ores/palladium.json     |   0
 .../tags/{blocks => block}/ores/platinum.json |   0
 .../tags/{blocks => block}/ores/thorium.json  |   0
 .../tags/{blocks => block}/ores/titanium.json |   0
 .../tags/{blocks => block}/ores/tungsten.json |   0
 .../tags/{blocks => block}/ores/uranium.json  |   0
 .../tags/{blocks => block}/ores/vanadium.json |   0
 .../c/tags/{blocks => block}/ores/zinc.json   |   0
 .../data/c/tags/{items => item}/tools.json    |   0
 .../{blocks => block}/mineable/pickaxe.json   |   0
 .../{blocks => block}/needs_diamond_tool.json |   0
 .../{blocks => block}/needs_iron_tool.json    |   0
 .../java/org/darkar/cog_works/CogWorks.java   |  95 ++--
 .../org/darkar/cog_works/CogWorksClient.java  |   7 +-
 .../java/org/darkar/cog_works/Registry.java   | 412 ++++++++++--------
 .../cog_works/block/events/BlockEvents.java   |  10 +-
 .../generation/data/BlockStateGenerator.java  |  10 +-
 .../generation/data/BlockTagGenerator.java    | 248 +++++------
 .../data/DataGenerationManager.java           |  14 +-
 .../generation/data/ItemTagGenerator.java     |  14 +-
 .../generation/data/WorldDataGenerator.java   |   4 +-
 .../generation/data/lang/EN_US_Generator.java |  96 ++--
 .../generation/world/BiomeModifiers.java      | 233 +++++-----
 .../generation/world/ConfiguredFeatures.java  | 340 +++++++++------
 .../generation/world/OrePlacement.java        |   7 +-
 .../generation/world/PlacedFeatures.java      | 111 +++--
 .../cog_works/item/EmptySampleTubeItem.java   |  13 +-
 .../cog_works/item/FilledSampleTubeItem.java  |  22 +-
 .../cog_works/item/ProspectingPickItem.java   |  53 ++-
 .../cog_works/item/ScrewdriverItem.java       |  14 +-
 .../item/component/IsDiggingSample.java       |  25 +-
 .../item/component/SampleLocation.java        |  17 +-
 .../cog_works/item/events/ItemEvents.java     |  17 +-
 .../renderer/EmptySampleTubeItemRenderer.java |   2 +-
 .../FilledSampleTubeItemRenderer.java         |   2 +-
 .../renderer/ProspectingPickItemRenderer.java |   6 +-
 .../renderer/ScrewdriverItemRenderer.java     |   2 +-
 .../chunk/attachment/ChunkSampleSiteMap.java  |  51 ++-
 .../renderer/SampleSiteRenderBehaviour.java   |  82 ++--
 .../darkar/cog_works/net/NetworkHandler.java  |  10 +-
 .../ClientSampleSiteMapUpdatePayload.java     |  17 +-
 .../java/org/darkar/cog_works/utils/Data.java |  84 ++--
 .../org/darkar/cog_works/utils/World.java     |  10 +-
 .../utils/enums/SampleSiteRegion.java         |  21 +-
 64 files changed, 1170 insertions(+), 957 deletions(-)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/bauxite.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/beryllium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/cadmium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/chromium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/cobalt.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/graphite.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/iridium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/lithium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/manganese.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/molybdenum.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/nickel.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/osmium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/palladium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/platinum.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/thorium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/titanium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/tungsten.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/uranium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/vanadium.json (100%)
 rename src/generated/resources/data/c/tags/{blocks => block}/ores/zinc.json (100%)
 rename src/generated/resources/data/c/tags/{items => item}/tools.json (100%)
 rename src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%)
 rename src/generated/resources/data/minecraft/tags/{blocks => block}/needs_diamond_tool.json (100%)
 rename src/generated/resources/data/minecraft/tags/{blocks => block}/needs_iron_tool.json (100%)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 856c3c9..0d6f1c4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -37,7 +37,7 @@
       <option name="PREFER_PARAMETERS_WRAP" value="true" />
       <option name="METHOD_PARAMETERS_WRAP" value="1" />
       <option name="THROWS_KEYWORD_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="2" />
       <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
       <option name="BINARY_OPERATION_WRAP" value="1" />
       <option name="TERNARY_OPERATION_WRAP" value="1" />
diff --git a/gradle.properties b/gradle.properties
index 2c5e62d..c1f46f8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,17 +14,17 @@ neogradle.subsystems.devLogin.enabled=true
 # Environment Properties
 # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.20.6
+minecraft_version=1.21
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.20.6,1.21)
+minecraft_version_range=[1.21.0,1.22)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=20.6.115
+neo_version=21.0.6-beta
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[20.6,)
+neo_version_range=[21.0.0-beta,)
 # The loader version range can only use the major version of FML as bounds
-loader_version_range=[2,)
+loader_version_range=[4,)
 
 ## Mod Properties
 
@@ -36,7 +36,7 @@ mod_name=Cog Works Engineering
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=PolyFormPerimeter-1.0
 # The mod version. See https://semver.org/
-mod_version=0.6.0
+mod_version=0.7.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html
@@ -49,5 +49,5 @@ mod_description=Elevate your Minecraft experience with Cog Works Engineering, a
 ## Dependencies
 
 # Gecko Lib
-gecko_lib_version=4.5.3
-gecko_lib_version_range=[4.5.3,)
+gecko_lib_version=4.5.5
+gecko_lib_version_range=[4.5.5,)
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
index 3dcd266..5365d76 100644
--- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
+++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.6	2024-05-21T19:25:09.0198765	Registries
+// 1.21	2024-06-14T16:49:27.9419898	Registries
 adcf5416695709d219ce4d7b4f0d1a94c5a92660 data/cog_works/neoforge/biome_modifier/add_bauxite_ore.json
 2328028e3096181713afde51f1b8e89b5451da2d data/cog_works/neoforge/biome_modifier/add_beryllium_ore.json
 a5a60db791361deb2d92496d42ccaff99ae3aad3 data/cog_works/neoforge/biome_modifier/add_cadmium_ore.json
diff --git a/src/generated/resources/.cache/289dbcd3e460bdbdb8ac17aa123e59a5f92a086d b/src/generated/resources/.cache/289dbcd3e460bdbdb8ac17aa123e59a5f92a086d
index 81eb9d4..1d73881 100644
--- a/src/generated/resources/.cache/289dbcd3e460bdbdb8ac17aa123e59a5f92a086d
+++ b/src/generated/resources/.cache/289dbcd3e460bdbdb8ac17aa123e59a5f92a086d
@@ -1,25 +1,25 @@
-// 1.20.6	2024-05-21T19:25:09.0183766	Tags for minecraft:block mod id cog_works
-1a6573827671e3b60d4bd14599a5d96c8563dea4 data/c/tags/blocks/ores.json
-8e78287246125b0e18a4f086e00f37fc8298ae00 data/c/tags/blocks/ores/bauxite.json
-11945b728eda841b521980d792506977f8dbf17c data/c/tags/blocks/ores/beryllium.json
-396e65747bfbe9848f20769e5d38f6d6bf84bbb9 data/c/tags/blocks/ores/cadmium.json
-f04e22f9c2f5c29fc0cc8699adb7f0acd81dc3dd data/c/tags/blocks/ores/chromium.json
-49280ece99a4c033b7b2592e7caaf4a5fcd52b8f data/c/tags/blocks/ores/cobalt.json
-005adf3e8dd399322ebfa268dd0456c8e3fa7e2f data/c/tags/blocks/ores/graphite.json
-3c034f3c93e22ad55a8a866c121b3842ce2faec2 data/c/tags/blocks/ores/iridium.json
-ffd6d649f2a2d1802403a3e37a1d8b13675ba556 data/c/tags/blocks/ores/lithium.json
-bf66cc2d3e867ce1d51ede15360e8c198462eff4 data/c/tags/blocks/ores/manganese.json
-32103ef4930c1b109015d7935915b3e1395ca3ec data/c/tags/blocks/ores/molybdenum.json
-2a308644fd36140101992c68bb57fcb95b613e98 data/c/tags/blocks/ores/nickel.json
-09161043b33d44b42b9077c21e350b9899db271a data/c/tags/blocks/ores/osmium.json
-2a258de4ef8ad588238b3efd22b580e5477b922d data/c/tags/blocks/ores/palladium.json
-d3b67ae304dff1fb62d7e632ec75032c7c782f7e data/c/tags/blocks/ores/platinum.json
-a8510c24f9b54ea46af72a7399de3ff8760a7d1e data/c/tags/blocks/ores/thorium.json
-9f9d51638d1ea8f13ea7fbd36206eb7237cc5702 data/c/tags/blocks/ores/titanium.json
-df7a2272e210bac05c0b10236534f1eca9df90c4 data/c/tags/blocks/ores/tungsten.json
-e969c8e005ba656c14fda7b1210e549a8dcbdcd1 data/c/tags/blocks/ores/uranium.json
-ed0917989c8fd94ba75bc921f5f99e2e5686efb9 data/c/tags/blocks/ores/vanadium.json
-47e3c5be8aa6bc35900fc081ac0cc19bfeaabe78 data/c/tags/blocks/ores/zinc.json
-95b15bada0ff3c70f5531af5624fc1290a96caaf data/minecraft/tags/blocks/mineable/pickaxe.json
-0588128a1c4b038372348beb255961e587767064 data/minecraft/tags/blocks/needs_diamond_tool.json
-2ef2283a7b8467e0556eeaeb65a99432d3618cf4 data/minecraft/tags/blocks/needs_iron_tool.json
+// 1.21	2024-06-14T16:49:27.9379848	Tags for minecraft:block mod id cog_works
+1a6573827671e3b60d4bd14599a5d96c8563dea4 data/c/tags/block/ores.json
+8e78287246125b0e18a4f086e00f37fc8298ae00 data/c/tags/block/ores/bauxite.json
+11945b728eda841b521980d792506977f8dbf17c data/c/tags/block/ores/beryllium.json
+396e65747bfbe9848f20769e5d38f6d6bf84bbb9 data/c/tags/block/ores/cadmium.json
+f04e22f9c2f5c29fc0cc8699adb7f0acd81dc3dd data/c/tags/block/ores/chromium.json
+49280ece99a4c033b7b2592e7caaf4a5fcd52b8f data/c/tags/block/ores/cobalt.json
+005adf3e8dd399322ebfa268dd0456c8e3fa7e2f data/c/tags/block/ores/graphite.json
+3c034f3c93e22ad55a8a866c121b3842ce2faec2 data/c/tags/block/ores/iridium.json
+ffd6d649f2a2d1802403a3e37a1d8b13675ba556 data/c/tags/block/ores/lithium.json
+bf66cc2d3e867ce1d51ede15360e8c198462eff4 data/c/tags/block/ores/manganese.json
+32103ef4930c1b109015d7935915b3e1395ca3ec data/c/tags/block/ores/molybdenum.json
+2a308644fd36140101992c68bb57fcb95b613e98 data/c/tags/block/ores/nickel.json
+09161043b33d44b42b9077c21e350b9899db271a data/c/tags/block/ores/osmium.json
+2a258de4ef8ad588238b3efd22b580e5477b922d data/c/tags/block/ores/palladium.json
+d3b67ae304dff1fb62d7e632ec75032c7c782f7e data/c/tags/block/ores/platinum.json
+a8510c24f9b54ea46af72a7399de3ff8760a7d1e data/c/tags/block/ores/thorium.json
+9f9d51638d1ea8f13ea7fbd36206eb7237cc5702 data/c/tags/block/ores/titanium.json
+df7a2272e210bac05c0b10236534f1eca9df90c4 data/c/tags/block/ores/tungsten.json
+e969c8e005ba656c14fda7b1210e549a8dcbdcd1 data/c/tags/block/ores/uranium.json
+ed0917989c8fd94ba75bc921f5f99e2e5686efb9 data/c/tags/block/ores/vanadium.json
+47e3c5be8aa6bc35900fc081ac0cc19bfeaabe78 data/c/tags/block/ores/zinc.json
+95b15bada0ff3c70f5531af5624fc1290a96caaf data/minecraft/tags/block/mineable/pickaxe.json
+0588128a1c4b038372348beb255961e587767064 data/minecraft/tags/block/needs_diamond_tool.json
+2ef2283a7b8467e0556eeaeb65a99432d3618cf4 data/minecraft/tags/block/needs_iron_tool.json
diff --git a/src/generated/resources/.cache/429a0e16dedc2e58d71866b4ee086752689880a7 b/src/generated/resources/.cache/429a0e16dedc2e58d71866b4ee086752689880a7
index e94483c..b37122b 100644
--- a/src/generated/resources/.cache/429a0e16dedc2e58d71866b4ee086752689880a7
+++ b/src/generated/resources/.cache/429a0e16dedc2e58d71866b4ee086752689880a7
@@ -1,2 +1,2 @@
-// 1.20.6	2024-06-11T22:02:13.0378519	Tags for minecraft:item mod id cog_works
-d92b976ae5e58ba810f8ab1f7a719a88ef218561 data/c/tags/items/tools.json
+// 1.21	2024-06-14T16:49:27.9429889	Tags for minecraft:item mod id cog_works
+d92b976ae5e58ba810f8ab1f7a719a88ef218561 data/c/tags/item/tools.json
diff --git a/src/generated/resources/.cache/f9f5b962781cbf5adcc0a5f1bb62946a57aa0390 b/src/generated/resources/.cache/f9f5b962781cbf5adcc0a5f1bb62946a57aa0390
index 9901862..a38d313 100644
--- a/src/generated/resources/.cache/f9f5b962781cbf5adcc0a5f1bb62946a57aa0390
+++ b/src/generated/resources/.cache/f9f5b962781cbf5adcc0a5f1bb62946a57aa0390
@@ -1,2 +1,2 @@
-// 1.20.6	2024-06-11T21:57:40.7538125	Languages: en_us for mod: cog_works
+// 1.21	2024-06-14T16:49:27.9434926	Languages: en_us for mod: cog_works
 939731dd39bf3448355f6e123ca0ff8ad03fa8d7 assets/cog_works/lang/en_us.json
diff --git a/src/generated/resources/.cache/fbf9d452c21740c3571315e0cdc4a0c2a56d2ed0 b/src/generated/resources/.cache/fbf9d452c21740c3571315e0cdc4a0c2a56d2ed0
index 801ec81..c47ae2f 100644
--- a/src/generated/resources/.cache/fbf9d452c21740c3571315e0cdc4a0c2a56d2ed0
+++ b/src/generated/resources/.cache/fbf9d452c21740c3571315e0cdc4a0c2a56d2ed0
@@ -1,4 +1,4 @@
-// 1.20.6	2024-05-21T19:34:44.7612577	Block States: cog_works
+// 1.21	2024-06-14T16:49:27.938989	Block States: cog_works
 350fd53949bfccc9cfb17e29adbfe32403fb4939 assets/cog_works/blockstates/bauxite_ore.json
 e51ca31dc1f38be3f3b26a2459d64999a3b05818 assets/cog_works/blockstates/beryllium_ore.json
 8377d58378ecf121fea543fbfc414d9082c0391f assets/cog_works/blockstates/cadmium_ore.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores.json b/src/generated/resources/data/c/tags/block/ores.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores.json
rename to src/generated/resources/data/c/tags/block/ores.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/bauxite.json b/src/generated/resources/data/c/tags/block/ores/bauxite.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/bauxite.json
rename to src/generated/resources/data/c/tags/block/ores/bauxite.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/beryllium.json b/src/generated/resources/data/c/tags/block/ores/beryllium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/beryllium.json
rename to src/generated/resources/data/c/tags/block/ores/beryllium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/cadmium.json b/src/generated/resources/data/c/tags/block/ores/cadmium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/cadmium.json
rename to src/generated/resources/data/c/tags/block/ores/cadmium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/chromium.json b/src/generated/resources/data/c/tags/block/ores/chromium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/chromium.json
rename to src/generated/resources/data/c/tags/block/ores/chromium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/cobalt.json b/src/generated/resources/data/c/tags/block/ores/cobalt.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/cobalt.json
rename to src/generated/resources/data/c/tags/block/ores/cobalt.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/graphite.json b/src/generated/resources/data/c/tags/block/ores/graphite.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/graphite.json
rename to src/generated/resources/data/c/tags/block/ores/graphite.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/iridium.json b/src/generated/resources/data/c/tags/block/ores/iridium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/iridium.json
rename to src/generated/resources/data/c/tags/block/ores/iridium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/lithium.json b/src/generated/resources/data/c/tags/block/ores/lithium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/lithium.json
rename to src/generated/resources/data/c/tags/block/ores/lithium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/manganese.json b/src/generated/resources/data/c/tags/block/ores/manganese.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/manganese.json
rename to src/generated/resources/data/c/tags/block/ores/manganese.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/molybdenum.json b/src/generated/resources/data/c/tags/block/ores/molybdenum.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/molybdenum.json
rename to src/generated/resources/data/c/tags/block/ores/molybdenum.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/nickel.json b/src/generated/resources/data/c/tags/block/ores/nickel.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/nickel.json
rename to src/generated/resources/data/c/tags/block/ores/nickel.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/osmium.json b/src/generated/resources/data/c/tags/block/ores/osmium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/osmium.json
rename to src/generated/resources/data/c/tags/block/ores/osmium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/palladium.json b/src/generated/resources/data/c/tags/block/ores/palladium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/palladium.json
rename to src/generated/resources/data/c/tags/block/ores/palladium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/platinum.json b/src/generated/resources/data/c/tags/block/ores/platinum.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/platinum.json
rename to src/generated/resources/data/c/tags/block/ores/platinum.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/thorium.json b/src/generated/resources/data/c/tags/block/ores/thorium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/thorium.json
rename to src/generated/resources/data/c/tags/block/ores/thorium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/titanium.json b/src/generated/resources/data/c/tags/block/ores/titanium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/titanium.json
rename to src/generated/resources/data/c/tags/block/ores/titanium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/tungsten.json b/src/generated/resources/data/c/tags/block/ores/tungsten.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/tungsten.json
rename to src/generated/resources/data/c/tags/block/ores/tungsten.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/uranium.json b/src/generated/resources/data/c/tags/block/ores/uranium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/uranium.json
rename to src/generated/resources/data/c/tags/block/ores/uranium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/vanadium.json b/src/generated/resources/data/c/tags/block/ores/vanadium.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/vanadium.json
rename to src/generated/resources/data/c/tags/block/ores/vanadium.json
diff --git a/src/generated/resources/data/c/tags/blocks/ores/zinc.json b/src/generated/resources/data/c/tags/block/ores/zinc.json
similarity index 100%
rename from src/generated/resources/data/c/tags/blocks/ores/zinc.json
rename to src/generated/resources/data/c/tags/block/ores/zinc.json
diff --git a/src/generated/resources/data/c/tags/items/tools.json b/src/generated/resources/data/c/tags/item/tools.json
similarity index 100%
rename from src/generated/resources/data/c/tags/items/tools.json
rename to src/generated/resources/data/c/tags/item/tools.json
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
similarity index 100%
rename from src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
rename to src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json
similarity index 100%
rename from src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json
rename to src/generated/resources/data/minecraft/tags/block/needs_diamond_tool.json
diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json
similarity index 100%
rename from src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json
rename to src/generated/resources/data/minecraft/tags/block/needs_iron_tool.json
diff --git a/src/main/java/org/darkar/cog_works/CogWorks.java b/src/main/java/org/darkar/cog_works/CogWorks.java
index 66bd206..35efb1b 100644
--- a/src/main/java/org/darkar/cog_works/CogWorks.java
+++ b/src/main/java/org/darkar/cog_works/CogWorks.java
@@ -14,52 +14,57 @@
 
 // The value here should match an entry in the META-INF/neoforge.mods.toml file
 @Mod(CogWorks.MOD_ID)
-public class CogWorks
-{
-    // Define mod id in a common place for everything to reference
-    public static final String MOD_ID = "cog_works";
-    // Directly reference a slf4j logger
-    public static final Logger LOGGER = LogUtils.getLogger();
-
+public class CogWorks {
+	// Define mod id in a common place for everything to reference
+	public static final String MOD_ID = "cog_works";
+	// Directly reference a slf4j logger
+	public static final Logger LOGGER = LogUtils.getLogger();
+	
 	@SuppressWarnings("OptionalGetWithoutIsPresent")
-	public static final String VERSION = ModList.get().getModContainerById(MOD_ID).get().getModInfo().getVersion().toString();
-
-
-
-    // The constructor for the mod class is the first code that is run when your mod is loaded.
-    // FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically.
-    public CogWorks(IEventBus modEventBus, ModContainer modContainer)
-    {
-        // Register the commonSetup method for modloading
-        modEventBus.addListener(this::commonSetup);
+	public static final String VERSION = ModList
+		.get()
+		.getModContainerById(MOD_ID)
+		.get()
+		.getModInfo()
+		.getVersion()
+		.toString();
+	
+	
+	// The constructor for the mod class is the first code that is run when your mod is loaded.
+	// FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically.
+	public CogWorks(IEventBus modEventBus, ModContainer modContainer)
+	{
+		// Register the commonSetup method for modloading
+		modEventBus.addListener(this::commonSetup);
 		
 		// Initialize Network Handling
-	    modEventBus.addListener(NetworkHandler::onPayloadHandlersRegister);
-
-        // Initialize mod registries
-	    Registry.initialize(modEventBus);
-
-        // Register ourselves for server and other game events we are interested in.
-        // Note that this is necessary if and only if we want *this* class (CogWorks) to respond directly to events.
-        // Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like onServerStarting() below.
-        NeoForge.EVENT_BUS.register(this);
-
-        // Register our mod's ModConfigSpec so that FML can create and load the config file for us
-        //modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
-    }
-
-    private void commonSetup(final FMLCommonSetupEvent event)
-    {
-        // Some common setup code
-        LOGGER.info("[Cog Works]: HELLO FROM COMMON SETUP");
-    }
-
-
-    // You can use SubscribeEvent and let the Event Bus discover methods to call
-    @SubscribeEvent
-    public void onServerStarting(ServerStartingEvent event)
-    {
-        // Do something when the server starts
-        LOGGER.info("[Cog Works]: HELLO from server starting");
-    }
+		modEventBus.addListener(NetworkHandler::onPayloadHandlersRegister);
+		
+		// Initialize mod registries
+		Registry.initialize(modEventBus);
+		
+		// Register ourselves for server and other game events we are interested in.
+		// Note that this is necessary if and only if we want *this* class (CogWorks) to respond directly to events.
+		// Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like
+		// onServerStarting() below.
+		NeoForge.EVENT_BUS.register(this);
+		
+		// Register our mod's ModConfigSpec so that FML can create and load the config file for us
+		//modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
+	}
+	
+	private void commonSetup(final FMLCommonSetupEvent event)
+	{
+		// Some common setup code
+		LOGGER.info("[Cog Works]: HELLO FROM COMMON SETUP");
+	}
+	
+	
+	// You can use SubscribeEvent and let the Event Bus discover methods to call
+	@SubscribeEvent
+	public void onServerStarting(ServerStartingEvent event)
+	{
+		// Do something when the server starts
+		LOGGER.info("[Cog Works]: HELLO from server starting");
+	}
 }
diff --git a/src/main/java/org/darkar/cog_works/CogWorksClient.java b/src/main/java/org/darkar/cog_works/CogWorksClient.java
index 33bfbfc..c3b3a8c 100644
--- a/src/main/java/org/darkar/cog_works/CogWorksClient.java
+++ b/src/main/java/org/darkar/cog_works/CogWorksClient.java
@@ -10,12 +10,15 @@
 
 @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT, modid = CogWorks.MOD_ID)
 public class CogWorksClient {
-
+	
 	@SubscribeEvent
 	public static void onClientSetup(FMLClientSetupEvent event)
 	{
 		// Some client setup code
 		LOGGER.info("[Cog Works]: HELLO FROM CLIENT SETUP");
-		LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
+		LOGGER.info("MINECRAFT NAME >> {}", Minecraft
+			.getInstance()
+			.getUser()
+			.getName());
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/Registry.java b/src/main/java/org/darkar/cog_works/Registry.java
index 069534c..c9eac72 100644
--- a/src/main/java/org/darkar/cog_works/Registry.java
+++ b/src/main/java/org/darkar/cog_works/Registry.java
@@ -37,294 +37,337 @@ public static class Blocks {
 		private static final DeferredRegister.Blocks DEFERRED_REGISTRY = DeferredRegister.createBlocks(MOD_ID);
 		// Tungsten Ore
 		public static final DeferredBlock<Block> TUNGSTEN_ORE = DEFERRED_REGISTRY.registerSimpleBlock("tungsten_ore",
-		                                                                                              BlockBehaviour.Properties
-			                                                                                              .of()
-			                                                                                              .strength(
-				                                                                                              3.0F,
-				                                                                                              3.0F)
-			                                                                                              .lightLevel(
-				                                                                                              (state) -> 7)
-			                                                                                              .sound(
-				                                                                                              SoundType.STONE)
+		                                                                                              BlockBehaviour.Properties.of()
+		                                                                                                                       .strength(
+			                                                                                                                       3.0F,
+			                                                                                                                       3.0F)
+		                                                                                                                       .lightLevel(
+			                                                                                                                       (state) -> 7)
+		                                                                                                                       .sound(
+			                                                                                                                       SoundType.STONE)
 		                                                                                             
 		                                                                                             );
 		public static final DeferredBlock<Block> DEEPSLATE_TUNGSTEN_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_tungsten_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_tungsten_ore", BlockBehaviour.Properties.of()
+			                                                   .strength(4.5F, 3.0F)
+			                                                   .lightLevel((state) -> 7)
 			                                                   .sound(SoundType.DEEPSLATE)
 		                                                                                                       
 		                                                                                                       );
 		// Titanium Ore
 		public static final DeferredBlock<Block> TITANIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("titanium_ore",
-		                                                                                              BlockBehaviour.Properties
-			                                                                                              .of()
-			                                                                                              .strength(
-				                                                                                              3.0F,
-				                                                                                              3.0F)
-			                                                                                              .lightLevel(
-				                                                                                              (state) -> 7)
-			                                                                                              .sound(
-				                                                                                              SoundType.STONE)
+		                                                                                              BlockBehaviour.Properties.of()
+		                                                                                                                       .strength(
+			                                                                                                                       3.0F,
+			                                                                                                                       3.0F)
+		                                                                                                                       .lightLevel(
+			                                                                                                                       (state) -> 7)
+		                                                                                                                       .sound(
+			                                                                                                                       SoundType.STONE)
 		                                                                                             
 		                                                                                             );
 		public static final DeferredBlock<Block> DEEPSLATE_TITANIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_titanium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_titanium_ore", BlockBehaviour.Properties.of()
+			                                                   .strength(4.5F, 3.0F)
+			                                                   .lightLevel((state) -> 7)
 			                                                   .sound(SoundType.DEEPSLATE)
 		                                                                                                       
 		                                                                                                       );
 		// Cobalt Ore
 		public static final DeferredBlock<Block> COBALT_ORE = DEFERRED_REGISTRY.registerSimpleBlock("cobalt_ore",
-		                                                                                            BlockBehaviour.Properties
-			                                                                                            .of().strength(
-			                                                                                                          3.0F, 3.0F)
-			                                                                                            .lightLevel(
-				                                                                                            (state) -> 7)
-			                                                                                            .sound(
-				                                                                                            SoundType.STONE)
+		                                                                                            BlockBehaviour.Properties.of()
+		                                                                                                                     .strength(
+			                                                                                                                     3.0F,
+			                                                                                                                     3.0F)
+		                                                                                                                     .lightLevel(
+			                                                                                                                     (state) -> 7)
+		                                                                                                                     .sound(
+			                                                                                                                     SoundType.STONE)
 		                                                                                           
 		                                                                                           );
 		public static final DeferredBlock<Block> DEEPSLATE_COBALT_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_cobalt_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_cobalt_ore", BlockBehaviour.Properties.of()
+			                                                 .strength(4.5F, 3.0F)
+			                                                 .lightLevel((state) -> 7)
 			                                                 .sound(SoundType.DEEPSLATE)
 		                                                                                                     
 		                                                                                                     );
 		// Nickel Ore
 		public static final DeferredBlock<Block> NICKEL_ORE = DEFERRED_REGISTRY.registerSimpleBlock("nickel_ore",
-		                                                                                            BlockBehaviour.Properties
-			                                                                                            .of().strength(
-			                                                                                                          3.0F, 3.0F)
-			                                                                                            .lightLevel(
-				                                                                                            (state) -> 7)
-			                                                                                            .sound(
-				                                                                                            SoundType.STONE)
+		                                                                                            BlockBehaviour.Properties.of()
+		                                                                                                                     .strength(
+			                                                                                                                     3.0F,
+			                                                                                                                     3.0F)
+		                                                                                                                     .lightLevel(
+			                                                                                                                     (state) -> 7)
+		                                                                                                                     .sound(
+			                                                                                                                     SoundType.STONE)
 		                                                                                           
 		                                                                                           );
 		public static final DeferredBlock<Block> DEEPSLATE_NICKEL_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_nickel_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_nickel_ore", BlockBehaviour.Properties.of()
+			                                                 .strength(4.5F, 3.0F)
+			                                                 .lightLevel((state) -> 7)
 			                                                 .sound(SoundType.DEEPSLATE)
 		                                                                                                     
 		                                                                                                     );
 		// Bauxite Ore
 		public static final DeferredBlock<Block> BAUXITE_ORE = DEFERRED_REGISTRY.registerSimpleBlock("bauxite_ore",
-		                                                                                             BlockBehaviour.Properties
-			                                                                                             .of().strength(
-			                                                                                                           3.0F, 3.0F)
-			                                                                                             .lightLevel(
-				                                                                                             (state) -> 7)
-			                                                                                             .sound(
-				                                                                                             SoundType.STONE)
+		                                                                                             BlockBehaviour.Properties.of()
+		                                                                                                                      .strength(
+			                                                                                                                      3.0F,
+			                                                                                                                      3.0F)
+		                                                                                                                      .lightLevel(
+			                                                                                                                      (state) -> 7)
+		                                                                                                                      .sound(
+			                                                                                                                      SoundType.STONE)
 		                                                                                            
 		                                                                                            );
 		public static final DeferredBlock<Block> DEEPSLATE_BAUXITE_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_bauxite_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_bauxite_ore", BlockBehaviour.Properties.of()
+			                                                  .strength(4.5F, 3.0F)
+			                                                  .lightLevel((state) -> 7)
 			                                                  .sound(SoundType.DEEPSLATE)
 		                                                                                                      
 		                                                                                                      );
 		// Molybdenum Ore
 		public static final DeferredBlock<Block> MOLYBDENUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"molybdenum_ore", BlockBehaviour.Properties.of().strength(3.0F, 3.0F).lightLevel((state) -> 7)
+			"molybdenum_ore", BlockBehaviour.Properties.of()
+			                                           .strength(3.0F, 3.0F)
+			                                           .lightLevel((state) -> 7)
 			                                           .sound(SoundType.STONE)
 		                                                                                               
 		                                                                                               );
 		public static final DeferredBlock<Block> DEEPSLATE_MOLYBDENUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_molybdenum_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_molybdenum_ore", BlockBehaviour.Properties.of()
+			                                                     .strength(4.5F, 3.0F)
+			                                                     .lightLevel((state) -> 7)
 			                                                     .sound(SoundType.DEEPSLATE)
 		                                                                                                         
 		                                                                                                         );
 		// Iridium Ore
 		public static final DeferredBlock<Block> IRIDIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("iridium_ore",
-		                                                                                             BlockBehaviour.Properties
-			                                                                                             .of().strength(
-			                                                                                                           3.0F, 3.0F)
-			                                                                                             .lightLevel(
-				                                                                                             (state) -> 7)
-			                                                                                             .sound(
-				                                                                                             SoundType.STONE)
+		                                                                                             BlockBehaviour.Properties.of()
+		                                                                                                                      .strength(
+			                                                                                                                      3.0F,
+			                                                                                                                      3.0F)
+		                                                                                                                      .lightLevel(
+			                                                                                                                      (state) -> 7)
+		                                                                                                                      .sound(
+			                                                                                                                      SoundType.STONE)
 		                                                                                            
 		                                                                                            );
 		public static final DeferredBlock<Block> DEEPSLATE_IRIDIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_iridium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_iridium_ore", BlockBehaviour.Properties.of()
+			                                                  .strength(4.5F, 3.0F)
+			                                                  .lightLevel((state) -> 7)
 			                                                  .sound(SoundType.DEEPSLATE)
 		                                                                                                      
 		                                                                                                      );
 		// Lithium Ore
 		public static final DeferredBlock<Block> LITHIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("lithium_ore",
-		                                                                                             BlockBehaviour.Properties
-			                                                                                             .of().strength(
-			                                                                                                           3.0F, 3.0F)
-			                                                                                             .lightLevel(
-				                                                                                             (state) -> 7)
-			                                                                                             .sound(
-				                                                                                             SoundType.STONE)
+		                                                                                             BlockBehaviour.Properties.of()
+		                                                                                                                      .strength(
+			                                                                                                                      3.0F,
+			                                                                                                                      3.0F)
+		                                                                                                                      .lightLevel(
+			                                                                                                                      (state) -> 7)
+		                                                                                                                      .sound(
+			                                                                                                                      SoundType.STONE)
 		                                                                                            
 		                                                                                            );
 		public static final DeferredBlock<Block> DEEPSLATE_LITHIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_lithium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_lithium_ore", BlockBehaviour.Properties.of()
+			                                                  .strength(4.5F, 3.0F)
+			                                                  .lightLevel((state) -> 7)
 			                                                  .sound(SoundType.DEEPSLATE)
 		                                                                                                      
 		                                                                                                      );
 		//Platinum Ore
 		public static final DeferredBlock<Block> PLATINUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("platinum_ore",
-		                                                                                              BlockBehaviour.Properties
-			                                                                                              .of()
-			                                                                                              .strength(
-				                                                                                              3.0F,
-				                                                                                              3.0F)
-			                                                                                              .lightLevel(
-				                                                                                              (state) -> 7)
-			                                                                                              .sound(
-				                                                                                              SoundType.STONE)
+		                                                                                              BlockBehaviour.Properties.of()
+		                                                                                                                       .strength(
+			                                                                                                                       3.0F,
+			                                                                                                                       3.0F)
+		                                                                                                                       .lightLevel(
+			                                                                                                                       (state) -> 7)
+		                                                                                                                       .sound(
+			                                                                                                                       SoundType.STONE)
 		                                                                                             
 		                                                                                             );
 		public static final DeferredBlock<Block> DEEPSLATE_PLATINUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_platinum_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_platinum_ore", BlockBehaviour.Properties.of()
+			                                                   .strength(4.5F, 3.0F)
+			                                                   .lightLevel((state) -> 7)
 			                                                   .sound(SoundType.DEEPSLATE)
 		                                                                                                       
 		                                                                                                       );
 		// Graphite Ore
 		public static final DeferredBlock<Block> GRAPHITE_ORE = DEFERRED_REGISTRY.registerSimpleBlock("graphite_ore",
-		                                                                                              BlockBehaviour.Properties
-			                                                                                              .of()
-			                                                                                              .strength(
-				                                                                                              3.0F,
-				                                                                                              3.0F)
-			                                                                                              .lightLevel(
-				                                                                                              (state) -> 7)
-			                                                                                              .sound(
-				                                                                                              SoundType.STONE)
+		                                                                                              BlockBehaviour.Properties.of()
+		                                                                                                                       .strength(
+			                                                                                                                       3.0F,
+			                                                                                                                       3.0F)
+		                                                                                                                       .lightLevel(
+			                                                                                                                       (state) -> 7)
+		                                                                                                                       .sound(
+			                                                                                                                       SoundType.STONE)
 		                                                                                             
 		                                                                                             );
 		public static final DeferredBlock<Block> DEEPSLATE_GRAPHITE_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_graphite_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_graphite_ore", BlockBehaviour.Properties.of()
+			                                                   .strength(4.5F, 3.0F)
+			                                                   .lightLevel((state) -> 7)
 			                                                   .sound(SoundType.DEEPSLATE));
 		// Beryllium Ore
 		public static final DeferredBlock<Block> BERYLLIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("beryllium_ore",
-		                                                                                               BlockBehaviour.Properties
-			                                                                                               .of()
-			                                                                                               .strength(
-				                                                                                               3.0F,
-				                                                                                               3.0F)
-			                                                                                               .lightLevel(
-				                                                                                               (state) -> 7)
-			                                                                                               .sound(
-				                                                                                               SoundType.STONE));
+		                                                                                               BlockBehaviour.Properties.of()
+		                                                                                                                        .strength(
+			                                                                                                                        3.0F,
+			                                                                                                                        3.0F)
+		                                                                                                                        .lightLevel(
+			                                                                                                                        (state) -> 7)
+		                                                                                                                        .sound(
+			                                                                                                                        SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_BERYLLIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_beryllium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_beryllium_ore", BlockBehaviour.Properties.of()
+			                                                    .strength(4.5F, 3.0F)
+			                                                    .lightLevel((state) -> 7)
 			                                                    .sound(SoundType.DEEPSLATE));
 		// Cadmium Ore
 		public static final DeferredBlock<Block> CADMIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("cadmium_ore",
-		                                                                                             BlockBehaviour.Properties
-			                                                                                             .of().strength(
-			                                                                                                           3.0F, 3.0F)
-			                                                                                             .lightLevel(
-				                                                                                             (state) -> 7)
-			                                                                                             .sound(
-				                                                                                             SoundType.STONE));
+		                                                                                             BlockBehaviour.Properties.of()
+		                                                                                                                      .strength(
+			                                                                                                                      3.0F,
+			                                                                                                                      3.0F)
+		                                                                                                                      .lightLevel(
+			                                                                                                                      (state) -> 7)
+		                                                                                                                      .sound(
+			                                                                                                                      SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_CADMIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_cadmium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_cadmium_ore", BlockBehaviour.Properties.of()
+			                                                  .strength(4.5F, 3.0F)
+			                                                  .lightLevel((state) -> 7)
 			                                                  .sound(SoundType.DEEPSLATE));
 		// Chromium Ore
 		public static final DeferredBlock<Block> CHROMIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("chromium_ore",
-		                                                                                              BlockBehaviour.Properties
-			                                                                                              .of()
-			                                                                                              .strength(
-				                                                                                              3.0F,
-				                                                                                              3.0F)
-			                                                                                              .lightLevel(
-				                                                                                              (state) -> 7)
-			                                                                                              .sound(
-				                                                                                              SoundType.STONE));
+		                                                                                              BlockBehaviour.Properties.of()
+		                                                                                                                       .strength(
+			                                                                                                                       3.0F,
+			                                                                                                                       3.0F)
+		                                                                                                                       .lightLevel(
+			                                                                                                                       (state) -> 7)
+		                                                                                                                       .sound(
+			                                                                                                                       SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_CHROMIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_chromium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_chromium_ore", BlockBehaviour.Properties.of()
+			                                                   .strength(4.5F, 3.0F)
+			                                                   .lightLevel((state) -> 7)
 			                                                   .sound(SoundType.DEEPSLATE));
 		//Manganese Ore
 		public static final DeferredBlock<Block> MANGANESE_ORE = DEFERRED_REGISTRY.registerSimpleBlock("manganese_ore",
-		                                                                                               BlockBehaviour.Properties
-			                                                                                               .of()
-			                                                                                               .strength(
-				                                                                                               3.0F,
-				                                                                                               3.0F)
-			                                                                                               .lightLevel(
-				                                                                                               (state) -> 7)
-			                                                                                               .sound(
-				                                                                                               SoundType.STONE));
+		                                                                                               BlockBehaviour.Properties.of()
+		                                                                                                                        .strength(
+			                                                                                                                        3.0F,
+			                                                                                                                        3.0F)
+		                                                                                                                        .lightLevel(
+			                                                                                                                        (state) -> 7)
+		                                                                                                                        .sound(
+			                                                                                                                        SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_MANGANESE_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_manganese_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_manganese_ore", BlockBehaviour.Properties.of()
+			                                                    .strength(4.5F, 3.0F)
+			                                                    .lightLevel((state) -> 7)
 			                                                    .sound(SoundType.DEEPSLATE));
 		// Osmium Ore
 		public static final DeferredBlock<Block> OSMIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("osmium_ore",
-		                                                                                            BlockBehaviour.Properties
-			                                                                                            .of().strength(
-			                                                                                                          3.0F, 3.0F)
-			                                                                                            .lightLevel(
-				                                                                                            (state) -> 7)
-			                                                                                            .sound(
-				                                                                                            SoundType.STONE));
+		                                                                                            BlockBehaviour.Properties.of()
+		                                                                                                                     .strength(
+			                                                                                                                     3.0F,
+			                                                                                                                     3.0F)
+		                                                                                                                     .lightLevel(
+			                                                                                                                     (state) -> 7)
+		                                                                                                                     .sound(
+			                                                                                                                     SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_OSMIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_osmium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_osmium_ore", BlockBehaviour.Properties.of()
+			                                                 .strength(4.5F, 3.0F)
+			                                                 .lightLevel((state) -> 7)
 			                                                 .sound(SoundType.DEEPSLATE));
 		// Palladium Ore
 		public static final DeferredBlock<Block> PALLADIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("palladium_ore",
-		                                                                                               BlockBehaviour.Properties
-			                                                                                               .of()
-			                                                                                               .strength(
-				                                                                                               3.0F,
-				                                                                                               3.0F)
-			                                                                                               .lightLevel(
-				                                                                                               (state) -> 7)
-			                                                                                               .sound(
-				                                                                                               SoundType.STONE));
+		                                                                                               BlockBehaviour.Properties.of()
+		                                                                                                                        .strength(
+			                                                                                                                        3.0F,
+			                                                                                                                        3.0F)
+		                                                                                                                        .lightLevel(
+			                                                                                                                        (state) -> 7)
+		                                                                                                                        .sound(
+			                                                                                                                        SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_PALLADIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_palladium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_palladium_ore", BlockBehaviour.Properties.of()
+			                                                    .strength(4.5F, 3.0F)
+			                                                    .lightLevel((state) -> 7)
 			                                                    .sound(SoundType.DEEPSLATE));
 		//Thorium Ore
 		public static final DeferredBlock<Block> THORIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("thorium_ore",
-		                                                                                             BlockBehaviour.Properties
-			                                                                                             .of().strength(
-			                                                                                                           3.0F, 3.0F)
-			                                                                                             .lightLevel(
-				                                                                                             (state) -> 7)
-			                                                                                             .sound(
-				                                                                                             SoundType.STONE));
+		                                                                                             BlockBehaviour.Properties.of()
+		                                                                                                                      .strength(
+			                                                                                                                      3.0F,
+			                                                                                                                      3.0F)
+		                                                                                                                      .lightLevel(
+			                                                                                                                      (state) -> 7)
+		                                                                                                                      .sound(
+			                                                                                                                      SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_THORIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_thorium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_thorium_ore", BlockBehaviour.Properties.of()
+			                                                  .strength(4.5F, 3.0F)
+			                                                  .lightLevel((state) -> 7)
 			                                                  .sound(SoundType.DEEPSLATE));
 		//Uranium Ore
 		public static final DeferredBlock<Block> URANIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("uranium_ore",
-		                                                                                             BlockBehaviour.Properties
-			                                                                                             .of().strength(
-			                                                                                                           3.0F, 3.0F)
-			                                                                                             .lightLevel(
-				                                                                                             (state) -> 7)
-			                                                                                             .sound(
-				                                                                                             SoundType.STONE));
+		                                                                                             BlockBehaviour.Properties.of()
+		                                                                                                                      .strength(
+			                                                                                                                      3.0F,
+			                                                                                                                      3.0F)
+		                                                                                                                      .lightLevel(
+			                                                                                                                      (state) -> 7)
+		                                                                                                                      .sound(
+			                                                                                                                      SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_URANIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_uranium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_uranium_ore", BlockBehaviour.Properties.of()
+			                                                  .strength(4.5F, 3.0F)
+			                                                  .lightLevel((state) -> 7)
 			                                                  .sound(SoundType.DEEPSLATE));
 		//Vanadium Ore
 		public static final DeferredBlock<Block> VANADIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock("vanadium_ore",
-		                                                                                              BlockBehaviour.Properties
-			                                                                                              .of()
-			                                                                                              .strength(
-				                                                                                              3.0F,
-				                                                                                              3.0F)
-			                                                                                              .lightLevel(
-				                                                                                              (state) -> 7)
-			                                                                                              .sound(
-				                                                                                              SoundType.STONE));
+		                                                                                              BlockBehaviour.Properties.of()
+		                                                                                                                       .strength(
+			                                                                                                                       3.0F,
+			                                                                                                                       3.0F)
+		                                                                                                                       .lightLevel(
+			                                                                                                                       (state) -> 7)
+		                                                                                                                       .sound(
+			                                                                                                                       SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_VANADIUM_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_vanadium_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_vanadium_ore", BlockBehaviour.Properties.of()
+			                                                   .strength(4.5F, 3.0F)
+			                                                   .lightLevel((state) -> 7)
 			                                                   .sound(SoundType.DEEPSLATE));
 		//Zinc Ore
 		public static final DeferredBlock<Block> ZINC_ORE = DEFERRED_REGISTRY.registerSimpleBlock("zinc_ore",
-		                                                                                          BlockBehaviour.Properties
-			                                                                                          .of().strength(
-			                                                                                                        3.0F, 3.0F)
-			                                                                                          .lightLevel(
-				                                                                                          (state) -> 7)
-			                                                                                          .sound(
-				                                                                                          SoundType.STONE));
+		                                                                                          BlockBehaviour.Properties.of()
+		                                                                                                                   .strength(
+			                                                                                                                   3.0F,
+			                                                                                                                   3.0F)
+		                                                                                                                   .lightLevel(
+			                                                                                                                   (state) -> 7)
+		                                                                                                                   .sound(
+			                                                                                                                   SoundType.STONE));
 		public static final DeferredBlock<Block> DEEPSLATE_ZINC_ORE = DEFERRED_REGISTRY.registerSimpleBlock(
-			"deepslate_zinc_ore", BlockBehaviour.Properties.of().strength(4.5F, 3.0F).lightLevel((state) -> 7)
+			"deepslate_zinc_ore", BlockBehaviour.Properties.of()
+			                                               .strength(4.5F, 3.0F)
+			                                               .lightLevel((state) -> 7)
 			                                               .sound(SoundType.DEEPSLATE));
 		
 		private static void init(IEventBus bus) {
@@ -356,11 +399,11 @@ public static class Tags {
 			public static final TagKey<Block> ZINC_ORES = createConventional("ores/zinc");
 			
 			private static TagKey<Block> createConventional(String name) {
-				return TagKey.create(Registries.BLOCK, new ResourceLocation("c", name));
+				return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", name));
 			}
 			
 			private static TagKey<Block> createCustom(String name) {
-				return TagKey.create(Registries.BLOCK, new ResourceLocation(MOD_ID, name));
+				return TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(MOD_ID, name));
 			}
 		}
 	}
@@ -439,7 +482,8 @@ public static class Items {
 		public static final DeferredItem<Item> FILLED_SAMPLE_TUBE = DEFERRED_REGISTRY.register("filled_sample_tube",
 		                                                                                       FilledSampleTubeItem::new);
 		
-		public static final DeferredItem<Item> SCREWDRIVER = DEFERRED_REGISTRY.register("screwdriver", ScrewdriverItem::new);
+		public static final DeferredItem<Item> SCREWDRIVER = DEFERRED_REGISTRY.register("screwdriver",
+		                                                                                ScrewdriverItem::new);
 		//endregion
 		
 		//endregion
@@ -469,13 +513,12 @@ public static class DataComponents {
 					                                                                      IsDiggingSample.STREAM_CODEC)
 				                                                                      .build());
 			public static final DeferredHolder<DataComponentType<?>, DataComponentType<SampleLocation>>
-				SAMPLE_LOCATION =
-				DEFERRED_REGISTRY.register("sample_chunk_location",
-				                           () -> DataComponentType.<SampleLocation>builder()
-				                                                    .persistent(SampleLocation.CODEC)
-				                                                    .networkSynchronized(
-					                                                    SampleLocation.STREAM_CODEC)
-				                                                    .build());
+				SAMPLE_LOCATION = DEFERRED_REGISTRY.register("sample_chunk_location",
+				                                             () -> DataComponentType.<SampleLocation>builder()
+				                                                                    .persistent(SampleLocation.CODEC)
+				                                                                    .networkSynchronized(
+					                                                                    SampleLocation.STREAM_CODEC)
+				                                                                    .build());
 			
 			private static void init(IEventBus bus) {
 				LOGGER.info("[Cog Works] Registering item data components ...");
@@ -490,7 +533,10 @@ public static class DataAttachments {
 		
 		public static final DeferredHolder<AttachmentType<?>, AttachmentType<ChunkSampleSiteMap>>
 			CHUNK_SAMPLE_SITE_MAP = DEFERRED_REGISTRY.register("chunk_sample_site_map", () -> AttachmentType.builder(
-			() -> ChunkSampleSiteMap.DEFAULT).serialize(ChunkSampleSiteMap.CODEC).build());
+				                                                                                                () -> ChunkSampleSiteMap.DEFAULT)
+			                                                                                                .serialize(
+				                                                                                                ChunkSampleSiteMap.CODEC)
+			                                                                                                .build());
 		
 		
 		private static void init(IEventBus bus) {
diff --git a/src/main/java/org/darkar/cog_works/block/events/BlockEvents.java b/src/main/java/org/darkar/cog_works/block/events/BlockEvents.java
index 101f74b..9aaab46 100644
--- a/src/main/java/org/darkar/cog_works/block/events/BlockEvents.java
+++ b/src/main/java/org/darkar/cog_works/block/events/BlockEvents.java
@@ -26,8 +26,8 @@ public class BlockEvents {
 	 * Handles the logic to update the {@link ChunkSampleSiteMap} when a block is broken and is a sample site.
 	 *
 	 * @param levelAccessor level where the block is broken
-	 * @param pos position of the block that was broken
-	 * @param player player that broke the block
+	 * @param pos           position of the block that was broken
+	 * @param player        player that broke the block
 	 */
 	private static void handleChunkSampleSiteMap(LevelAccessor levelAccessor, BlockPos pos, Player player) {
 		ChunkAccess chunk = levelAccessor.getChunk(pos);
@@ -41,16 +41,14 @@ private static void handleChunkSampleSiteMap(LevelAccessor levelAccessor, BlockP
 		if (ChunkSampleSiteMapUtil.isSurface(chunkSampleSiteMap, pos)) {
 			ChunkSampleSiteMap newChunkSampleSiteMap = ChunkSampleSiteMapUtil.resetDefaultSurface(chunkSampleSiteMap);
 			chunk.setData(CHUNK_SAMPLE_SITE_MAP, newChunkSampleSiteMap);
-			payload = Optional.of(new ClientSampleSiteMapUpdatePayload(chunk.getPos(),
-			                                                           newChunkSampleSiteMap));
+			payload = Optional.of(new ClientSampleSiteMapUpdatePayload(chunk.getPos(), newChunkSampleSiteMap));
 			
 		}
 		
 		if (ChunkSampleSiteMapUtil.isDeep(chunkSampleSiteMap, pos)) {
 			ChunkSampleSiteMap newChunkSampleSiteMap = ChunkSampleSiteMapUtil.resetDefaultDeep(chunkSampleSiteMap);
 			chunk.setData(CHUNK_SAMPLE_SITE_MAP, newChunkSampleSiteMap);
-			payload = Optional.of(new ClientSampleSiteMapUpdatePayload(chunk.getPos(),
-			                                                           newChunkSampleSiteMap));
+			payload = Optional.of(new ClientSampleSiteMapUpdatePayload(chunk.getPos(), newChunkSampleSiteMap));
 		}
 		
 		
diff --git a/src/main/java/org/darkar/cog_works/generation/data/BlockStateGenerator.java b/src/main/java/org/darkar/cog_works/generation/data/BlockStateGenerator.java
index 3a81d96..65bb399 100644
--- a/src/main/java/org/darkar/cog_works/generation/data/BlockStateGenerator.java
+++ b/src/main/java/org/darkar/cog_works/generation/data/BlockStateGenerator.java
@@ -10,12 +10,12 @@
 import static org.darkar.cog_works.CogWorks.MOD_ID;
 
 public class BlockStateGenerator extends BlockStateProvider {
-
+	
 	public BlockStateGenerator(PackOutput output, ExistingFileHelper existingFileHelper) {
 		super(output, MOD_ID, existingFileHelper);
 	}
-
-
+	
+	
 	@Override
 	protected void registerStatesAndModels() {
 		blockWithItem(Registry.Blocks.TUNGSTEN_ORE);
@@ -59,9 +59,9 @@ protected void registerStatesAndModels() {
 		blockWithItem(Registry.Blocks.ZINC_ORE);
 		blockWithItem(Registry.Blocks.DEEPSLATE_ZINC_ORE);
 	}
-
+	
 	private void blockWithItem(DeferredBlock<?> block) {
 		simpleBlockWithItem(block.get(), cubeAll(block.get()));
 	}
-
+	
 }
diff --git a/src/main/java/org/darkar/cog_works/generation/data/BlockTagGenerator.java b/src/main/java/org/darkar/cog_works/generation/data/BlockTagGenerator.java
index efad8ce..7864c78 100644
--- a/src/main/java/org/darkar/cog_works/generation/data/BlockTagGenerator.java
+++ b/src/main/java/org/darkar/cog_works/generation/data/BlockTagGenerator.java
@@ -15,146 +15,120 @@
 import static org.darkar.cog_works.Registry.Blocks.Tags.*;
 
 public class BlockTagGenerator extends BlockTagsProvider {
-	public BlockTagGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
+	public BlockTagGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider,
+	                         @Nullable ExistingFileHelper existingFileHelper)
+	{
 		super(output, lookupProvider, MOD_ID, existingFileHelper);
 	}
-
+	
 	@Override
 	protected void addTags(HolderLookup.Provider pProvider) {
-
-
-
-		 tag(BlockTags.MINEABLE_WITH_PICKAXE).add(
-			Registry.Blocks.TUNGSTEN_ORE.get(),
-			Registry.Blocks.TITANIUM_ORE.get(),
-			Registry.Blocks.COBALT_ORE.get(),
-			Registry.Blocks.NICKEL_ORE.get(),
-			Registry.Blocks.PLATINUM_ORE.get(),
-			Registry.Blocks.BAUXITE_ORE.get(),
-			Registry.Blocks.MOLYBDENUM_ORE.get(),
-			Registry.Blocks.LITHIUM_ORE.get(),
-			Registry.Blocks.IRIDIUM_ORE.get(),
-			Registry.Blocks.GRAPHITE_ORE.get(),
-			Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE.get(),
-			Registry.Blocks.DEEPSLATE_TITANIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_COBALT_ORE.get(),
-			Registry.Blocks.DEEPSLATE_NICKEL_ORE.get(),
-			Registry.Blocks.DEEPSLATE_PLATINUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_BAUXITE_ORE.get(),
-			Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_LITHIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_IRIDIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_GRAPHITE_ORE.get(),
-			Registry.Blocks.BERYLLIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE.get(),
-			Registry.Blocks.CADMIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_CADMIUM_ORE.get(),
-			Registry.Blocks.CHROMIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_CHROMIUM_ORE.get(),
-			Registry.Blocks.MANGANESE_ORE.get(),
-			Registry.Blocks.DEEPSLATE_MANGANESE_ORE.get(),
-			Registry.Blocks.OSMIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_OSMIUM_ORE.get(),
-			Registry.Blocks.PALLADIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_PALLADIUM_ORE.get(),
-			Registry.Blocks.THORIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_THORIUM_ORE.get(),
-			Registry.Blocks.URANIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_URANIUM_ORE.get(),
-			Registry.Blocks.VANADIUM_ORE.get(),
-			Registry.Blocks.DEEPSLATE_VANADIUM_ORE.get(),
-			Registry.Blocks.ZINC_ORE.get(),
-			Registry.Blocks.DEEPSLATE_ZINC_ORE.get()
-		                                              );
-
-		 tag(BlockTags.NEEDS_IRON_TOOL).add(
-			 Registry.Blocks.COBALT_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_COBALT_ORE.get(),
-			 Registry.Blocks.NICKEL_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_NICKEL_ORE.get(),
-			 Registry.Blocks.BAUXITE_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_BAUXITE_ORE.get(),
-			 Registry.Blocks.LITHIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_LITHIUM_ORE.get(),
-			 Registry.Blocks.GRAPHITE_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_GRAPHITE_ORE.get(),
-			 Registry.Blocks.BERYLLIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE.get(),
-			 Registry.Blocks.CADMIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_CADMIUM_ORE.get(),
-			 Registry.Blocks.CHROMIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_CHROMIUM_ORE.get(),
-			 Registry.Blocks.MANGANESE_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_MANGANESE_ORE.get(),
-			 Registry.Blocks.OSMIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_OSMIUM_ORE.get(),
-			 Registry.Blocks.PALLADIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_PALLADIUM_ORE.get(),
-			 Registry.Blocks.THORIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_THORIUM_ORE.get(),
-             Registry.Blocks.URANIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_URANIUM_ORE.get(),
-			 Registry.Blocks.VANADIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_VANADIUM_ORE.get(),
-			 Registry.Blocks.ZINC_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_ZINC_ORE.get()
-		                                         );
-
-		 tag(BlockTags.NEEDS_DIAMOND_TOOL).add(
-			 Registry.Blocks.TUNGSTEN_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE.get(),
-			 Registry.Blocks.TITANIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_TITANIUM_ORE.get(),
-			 Registry.Blocks.PLATINUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_PLATINUM_ORE.get(),
-			 Registry.Blocks.MOLYBDENUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE.get(),
-			 Registry.Blocks.IRIDIUM_ORE.get(),
-			 Registry.Blocks.DEEPSLATE_IRIDIUM_ORE.get()
-		                                         );
-
-		 tag(BAUXITE_ORES).add(Registry.Blocks.BAUXITE_ORE.get(), Registry.Blocks.DEEPSLATE_BAUXITE_ORE.get());
-		 tag(GRAPHITE_ORES).add(Registry.Blocks.GRAPHITE_ORE.get(), Registry.Blocks.DEEPSLATE_GRAPHITE_ORE.get());
-		 tag(LITHIUM_ORES).add(Registry.Blocks.LITHIUM_ORE.get(), Registry.Blocks.DEEPSLATE_LITHIUM_ORE.get());
-		 tag(MOLYBDENUM_ORES).add(Registry.Blocks.MOLYBDENUM_ORE.get(), Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE.get());
-		 tag(IRIDIUM_ORES).add(Registry.Blocks.IRIDIUM_ORE.get(), Registry.Blocks.DEEPSLATE_IRIDIUM_ORE.get());
-		 tag(TUNGSTEN_ORES).add(Registry.Blocks.TUNGSTEN_ORE.get(), Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE.get());
-		 tag(TITANIUM_ORES).add(Registry.Blocks.TITANIUM_ORE.get(), Registry.Blocks.DEEPSLATE_TITANIUM_ORE.get());
-		 tag(COBALT_ORES).add(Registry.Blocks.COBALT_ORE.get(), Registry.Blocks.DEEPSLATE_COBALT_ORE.get());
-		 tag(NICKEL_ORES).add(Registry.Blocks.NICKEL_ORE.get(), Registry.Blocks.DEEPSLATE_NICKEL_ORE.get());
-		 tag(PLATINUM_ORES).add(Registry.Blocks.PLATINUM_ORE.get(), Registry.Blocks.DEEPSLATE_PLATINUM_ORE.get());
-		 tag(BERYLLIUM_ORES).add(Registry.Blocks.BERYLLIUM_ORE.get(), Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE.get());
-		 tag(CADMIUM_ORES).add(Registry.Blocks.CADMIUM_ORE.get(), Registry.Blocks.DEEPSLATE_CADMIUM_ORE.get());
-		 tag(CHROMIUM_ORES).add(Registry.Blocks.CHROMIUM_ORE.get(), Registry.Blocks.DEEPSLATE_CHROMIUM_ORE.get());
-		 tag(MANGANESE_ORES).add(Registry.Blocks.MANGANESE_ORE.get(), Registry.Blocks.DEEPSLATE_MANGANESE_ORE.get());
-		 tag(OSMIUM_ORES).add(Registry.Blocks.OSMIUM_ORE.get(), Registry.Blocks.DEEPSLATE_OSMIUM_ORE.get());
-		 tag(PALLADIUM_ORES).add(Registry.Blocks.PALLADIUM_ORE.get(), Registry.Blocks.DEEPSLATE_PALLADIUM_ORE.get());
-		 tag(THORIUM_ORES).add(Registry.Blocks.THORIUM_ORE.get(), Registry.Blocks.DEEPSLATE_THORIUM_ORE.get());
-		 tag(URANIUM_ORES).add(Registry.Blocks.URANIUM_ORE.get(), Registry.Blocks.DEEPSLATE_URANIUM_ORE.get());
-		 tag(VANADIUM_ORES).add(Registry.Blocks.VANADIUM_ORE.get(), Registry.Blocks.DEEPSLATE_VANADIUM_ORE.get());
-		 tag(ZINC_ORES).add(Registry.Blocks.ZINC_ORE.get(), Registry.Blocks.DEEPSLATE_ZINC_ORE.get());
-
-		 tag(Tags.Blocks.ORES).addTags(
-			 BAUXITE_ORES,
-			 GRAPHITE_ORES,
-			 LITHIUM_ORES,
-			 MOLYBDENUM_ORES,
-			 IRIDIUM_ORES,
-			 TUNGSTEN_ORES,
-			 TITANIUM_ORES,
-			 COBALT_ORES,
-			 NICKEL_ORES,
-			 PLATINUM_ORES,
-			 BERYLLIUM_ORES,
-			 CADMIUM_ORES,
-			 CHROMIUM_ORES,
-			 MANGANESE_ORES,
-			 OSMIUM_ORES,
-			 PALLADIUM_ORES,
-			 THORIUM_ORES,
-			 URANIUM_ORES,
-			 VANADIUM_ORES,
-			 ZINC_ORES
-		                               );
+		
+		
+		tag(BlockTags.MINEABLE_WITH_PICKAXE).add(Registry.Blocks.TUNGSTEN_ORE.get(),
+		                                         Registry.Blocks.TITANIUM_ORE.get(),
+		                                         Registry.Blocks.COBALT_ORE.get(), Registry.Blocks.NICKEL_ORE.get(),
+		                                         Registry.Blocks.PLATINUM_ORE.get(), Registry.Blocks.BAUXITE_ORE.get(),
+		                                         Registry.Blocks.MOLYBDENUM_ORE.get(),
+		                                         Registry.Blocks.LITHIUM_ORE.get(), Registry.Blocks.IRIDIUM_ORE.get(),
+		                                         Registry.Blocks.GRAPHITE_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_TITANIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_COBALT_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_NICKEL_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_PLATINUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_BAUXITE_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_LITHIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_IRIDIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_GRAPHITE_ORE.get(),
+		                                         Registry.Blocks.BERYLLIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE.get(),
+		                                         Registry.Blocks.CADMIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_CADMIUM_ORE.get(),
+		                                         Registry.Blocks.CHROMIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_CHROMIUM_ORE.get(),
+		                                         Registry.Blocks.MANGANESE_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_MANGANESE_ORE.get(),
+		                                         Registry.Blocks.OSMIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_OSMIUM_ORE.get(),
+		                                         Registry.Blocks.PALLADIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_PALLADIUM_ORE.get(),
+		                                         Registry.Blocks.THORIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_THORIUM_ORE.get(),
+		                                         Registry.Blocks.URANIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_URANIUM_ORE.get(),
+		                                         Registry.Blocks.VANADIUM_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_VANADIUM_ORE.get(),
+		                                         Registry.Blocks.ZINC_ORE.get(),
+		                                         Registry.Blocks.DEEPSLATE_ZINC_ORE.get());
+		
+		tag(BlockTags.NEEDS_IRON_TOOL).add(Registry.Blocks.COBALT_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_COBALT_ORE.get(),
+		                                   Registry.Blocks.NICKEL_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_NICKEL_ORE.get(),
+		                                   Registry.Blocks.BAUXITE_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_BAUXITE_ORE.get(),
+		                                   Registry.Blocks.LITHIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_LITHIUM_ORE.get(),
+		                                   Registry.Blocks.GRAPHITE_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_GRAPHITE_ORE.get(),
+		                                   Registry.Blocks.BERYLLIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE.get(),
+		                                   Registry.Blocks.CADMIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_CADMIUM_ORE.get(),
+		                                   Registry.Blocks.CHROMIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_CHROMIUM_ORE.get(),
+		                                   Registry.Blocks.MANGANESE_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_MANGANESE_ORE.get(),
+		                                   Registry.Blocks.OSMIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_OSMIUM_ORE.get(),
+		                                   Registry.Blocks.PALLADIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_PALLADIUM_ORE.get(),
+		                                   Registry.Blocks.THORIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_THORIUM_ORE.get(),
+		                                   Registry.Blocks.URANIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_URANIUM_ORE.get(),
+		                                   Registry.Blocks.VANADIUM_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_VANADIUM_ORE.get(),
+		                                   Registry.Blocks.ZINC_ORE.get(),
+		                                   Registry.Blocks.DEEPSLATE_ZINC_ORE.get());
+		
+		tag(BlockTags.NEEDS_DIAMOND_TOOL).add(Registry.Blocks.TUNGSTEN_ORE.get(),
+		                                      Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE.get(),
+		                                      Registry.Blocks.TITANIUM_ORE.get(),
+		                                      Registry.Blocks.DEEPSLATE_TITANIUM_ORE.get(),
+		                                      Registry.Blocks.PLATINUM_ORE.get(),
+		                                      Registry.Blocks.DEEPSLATE_PLATINUM_ORE.get(),
+		                                      Registry.Blocks.MOLYBDENUM_ORE.get(),
+		                                      Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE.get(),
+		                                      Registry.Blocks.IRIDIUM_ORE.get(),
+		                                      Registry.Blocks.DEEPSLATE_IRIDIUM_ORE.get());
+		
+		tag(BAUXITE_ORES).add(Registry.Blocks.BAUXITE_ORE.get(), Registry.Blocks.DEEPSLATE_BAUXITE_ORE.get());
+		tag(GRAPHITE_ORES).add(Registry.Blocks.GRAPHITE_ORE.get(), Registry.Blocks.DEEPSLATE_GRAPHITE_ORE.get());
+		tag(LITHIUM_ORES).add(Registry.Blocks.LITHIUM_ORE.get(), Registry.Blocks.DEEPSLATE_LITHIUM_ORE.get());
+		tag(MOLYBDENUM_ORES).add(Registry.Blocks.MOLYBDENUM_ORE.get(), Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE.get());
+		tag(IRIDIUM_ORES).add(Registry.Blocks.IRIDIUM_ORE.get(), Registry.Blocks.DEEPSLATE_IRIDIUM_ORE.get());
+		tag(TUNGSTEN_ORES).add(Registry.Blocks.TUNGSTEN_ORE.get(), Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE.get());
+		tag(TITANIUM_ORES).add(Registry.Blocks.TITANIUM_ORE.get(), Registry.Blocks.DEEPSLATE_TITANIUM_ORE.get());
+		tag(COBALT_ORES).add(Registry.Blocks.COBALT_ORE.get(), Registry.Blocks.DEEPSLATE_COBALT_ORE.get());
+		tag(NICKEL_ORES).add(Registry.Blocks.NICKEL_ORE.get(), Registry.Blocks.DEEPSLATE_NICKEL_ORE.get());
+		tag(PLATINUM_ORES).add(Registry.Blocks.PLATINUM_ORE.get(), Registry.Blocks.DEEPSLATE_PLATINUM_ORE.get());
+		tag(BERYLLIUM_ORES).add(Registry.Blocks.BERYLLIUM_ORE.get(), Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE.get());
+		tag(CADMIUM_ORES).add(Registry.Blocks.CADMIUM_ORE.get(), Registry.Blocks.DEEPSLATE_CADMIUM_ORE.get());
+		tag(CHROMIUM_ORES).add(Registry.Blocks.CHROMIUM_ORE.get(), Registry.Blocks.DEEPSLATE_CHROMIUM_ORE.get());
+		tag(MANGANESE_ORES).add(Registry.Blocks.MANGANESE_ORE.get(), Registry.Blocks.DEEPSLATE_MANGANESE_ORE.get());
+		tag(OSMIUM_ORES).add(Registry.Blocks.OSMIUM_ORE.get(), Registry.Blocks.DEEPSLATE_OSMIUM_ORE.get());
+		tag(PALLADIUM_ORES).add(Registry.Blocks.PALLADIUM_ORE.get(), Registry.Blocks.DEEPSLATE_PALLADIUM_ORE.get());
+		tag(THORIUM_ORES).add(Registry.Blocks.THORIUM_ORE.get(), Registry.Blocks.DEEPSLATE_THORIUM_ORE.get());
+		tag(URANIUM_ORES).add(Registry.Blocks.URANIUM_ORE.get(), Registry.Blocks.DEEPSLATE_URANIUM_ORE.get());
+		tag(VANADIUM_ORES).add(Registry.Blocks.VANADIUM_ORE.get(), Registry.Blocks.DEEPSLATE_VANADIUM_ORE.get());
+		tag(ZINC_ORES).add(Registry.Blocks.ZINC_ORE.get(), Registry.Blocks.DEEPSLATE_ZINC_ORE.get());
+		
+		tag(Tags.Blocks.ORES).addTags(BAUXITE_ORES, GRAPHITE_ORES, LITHIUM_ORES, MOLYBDENUM_ORES, IRIDIUM_ORES,
+		                              TUNGSTEN_ORES, TITANIUM_ORES, COBALT_ORES, NICKEL_ORES, PLATINUM_ORES,
+		                              BERYLLIUM_ORES, CADMIUM_ORES, CHROMIUM_ORES, MANGANESE_ORES, OSMIUM_ORES,
+		                              PALLADIUM_ORES, THORIUM_ORES, URANIUM_ORES, VANADIUM_ORES, ZINC_ORES);
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/generation/data/DataGenerationManager.java b/src/main/java/org/darkar/cog_works/generation/data/DataGenerationManager.java
index 46cbc44..e17f052 100644
--- a/src/main/java/org/darkar/cog_works/generation/data/DataGenerationManager.java
+++ b/src/main/java/org/darkar/cog_works/generation/data/DataGenerationManager.java
@@ -15,19 +15,23 @@
 
 @EventBusSubscriber(modid = MOD_ID, bus = EventBusSubscriber.Bus.MOD)
 public class DataGenerationManager {
-
+	
 	@SubscribeEvent
 	public static void onGatherData(GatherDataEvent event) {
 		DataGenerator generator = event.getGenerator();
 		PackOutput output = generator.getPackOutput();
 		ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
 		CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
-
+		
 		generator.addProvider(event.includeClient(), new BlockStateGenerator(output, existingFileHelper));
-		BlockTagGenerator blockTagGenerator = generator.addProvider(event.includeServer(), new BlockTagGenerator(output, lookupProvider, existingFileHelper));
-		generator.addProvider(event.includeServer(), new ItemTagGenerator(output, lookupProvider, blockTagGenerator.contentsGetter(), existingFileHelper));
+		BlockTagGenerator blockTagGenerator = generator.addProvider(event.includeServer(),
+		                                                            new BlockTagGenerator(output, lookupProvider,
+		                                                                                  existingFileHelper));
+		generator.addProvider(event.includeServer(),
+		                      new ItemTagGenerator(output, lookupProvider, blockTagGenerator.contentsGetter(),
+		                                           existingFileHelper));
 		generator.addProvider(event.includeClient(), new EN_US_Generator(output));
-
+		
 		generator.addProvider(event.includeServer(), new WorldDataGenerator(output, lookupProvider));
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/generation/data/ItemTagGenerator.java b/src/main/java/org/darkar/cog_works/generation/data/ItemTagGenerator.java
index b5686f1..d6bc622 100644
--- a/src/main/java/org/darkar/cog_works/generation/data/ItemTagGenerator.java
+++ b/src/main/java/org/darkar/cog_works/generation/data/ItemTagGenerator.java
@@ -15,17 +15,15 @@
 
 public class ItemTagGenerator extends ItemTagsProvider {
 	public ItemTagGenerator(PackOutput pOutput, CompletableFuture<HolderLookup.Provider> pLookupProvider,
-	                        CompletableFuture<TagLookup<Block>> pBlockTags, @Nullable ExistingFileHelper existingFileHelper) {
+	                        CompletableFuture<TagLookup<Block>> pBlockTags,
+	                        @Nullable ExistingFileHelper existingFileHelper)
+	{
 		super(pOutput, pLookupProvider, pBlockTags, MOD_ID, existingFileHelper);
 	}
-
+	
 	@Override
 	protected void addTags(HolderLookup.Provider pProvider) {
-		tag(Tags.Items.TOOLS).add(
-			Registry.Items.PROSPECTING_PICK.get(),
-			Registry.Items.SCREWDRIVER.get(),
-			Registry.Items.EMPTY_SAMPLE_TUBE.get(),
-			Registry.Items.FILLED_SAMPLE_TUBE.get()
-		                         );
+		tag(Tags.Items.TOOLS).add(Registry.Items.PROSPECTING_PICK.get(), Registry.Items.SCREWDRIVER.get(),
+		                          Registry.Items.EMPTY_SAMPLE_TUBE.get(), Registry.Items.FILLED_SAMPLE_TUBE.get());
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/generation/data/WorldDataGenerator.java b/src/main/java/org/darkar/cog_works/generation/data/WorldDataGenerator.java
index d126e11..283a983 100644
--- a/src/main/java/org/darkar/cog_works/generation/data/WorldDataGenerator.java
+++ b/src/main/java/org/darkar/cog_works/generation/data/WorldDataGenerator.java
@@ -20,7 +20,7 @@ public class WorldDataGenerator extends DatapackBuiltinEntriesProvider {
 		.add(Registries.CONFIGURED_FEATURE, ConfiguredFeatures::bootstrap)
 		.add(Registries.PLACED_FEATURE, PlacedFeatures::bootstrap)
 		.add(NeoForgeRegistries.Keys.BIOME_MODIFIERS, BiomeModifiers::bootstrap);
-
+	
 	/**
 	 * Constructs a new data pack provider which generates all registry objects
 	 * from the provided mods using the holder.
@@ -29,6 +29,6 @@ public class WorldDataGenerator extends DatapackBuiltinEntriesProvider {
 	 * @param registries a future of a lookup for registries and their objects
 	 */
 	public WorldDataGenerator(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
-		super(output, registries, BUILDER,Set.of(MOD_ID));
+		super(output, registries, BUILDER, Set.of(MOD_ID));
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/generation/data/lang/EN_US_Generator.java b/src/main/java/org/darkar/cog_works/generation/data/lang/EN_US_Generator.java
index b38d8ac..ce6fa54 100644
--- a/src/main/java/org/darkar/cog_works/generation/data/lang/EN_US_Generator.java
+++ b/src/main/java/org/darkar/cog_works/generation/data/lang/EN_US_Generator.java
@@ -10,59 +10,59 @@ public class EN_US_Generator extends LanguageProvider {
 	public EN_US_Generator(PackOutput output) {
 		super(output, MOD_ID, "en_us");
 	}
-
+	
 	@Override
 	protected void addTranslations() {
 		
 		// region Blocks
-	   addBlock(Registry.Blocks.TUNGSTEN_ORE, "Tungsten Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE, "Deepslate Tungsten Ore");
-	   addBlock(Registry.Blocks.TITANIUM_ORE, "Titanium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_TITANIUM_ORE, "Deepslate Titanium Ore");
-	   addBlock(Registry.Blocks.COBALT_ORE, "Cobalt Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_COBALT_ORE, "Deepslate Cobalt Ore");
-	   addBlock(Registry.Blocks.NICKEL_ORE, "Nickel Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_NICKEL_ORE, "Deepslate Nickel Ore");
-	   addBlock(Registry.Blocks.BAUXITE_ORE, "Bauxite Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_BAUXITE_ORE, "Deepslate Bauxite Ore");
-	   addBlock(Registry.Blocks.MOLYBDENUM_ORE, "Molybdenum Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE, "Deepslate Molybdenum Ore");
-	   addBlock(Registry.Blocks.IRIDIUM_ORE, "Iridium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_IRIDIUM_ORE, "Deepslate Iridium Ore");
-	   addBlock(Registry.Blocks.LITHIUM_ORE, "Lithium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_LITHIUM_ORE, "Deepslate Lithium Ore");
-	   addBlock(Registry.Blocks.PLATINUM_ORE, "Platinum Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_PLATINUM_ORE, "Deepslate Platinum Ore");
-	   addBlock(Registry.Blocks.GRAPHITE_ORE, "Graphite Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_GRAPHITE_ORE, "Deepslate Graphite Ore");
-	   addBlock(Registry.Blocks.BERYLLIUM_ORE, "Beryllium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE, "Deepslate Beryllium Ore");
-	   addBlock(Registry.Blocks.CADMIUM_ORE, "Cadmium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_CADMIUM_ORE, "Deepslate Cadmium Ore");
-	   addBlock(Registry.Blocks.CHROMIUM_ORE, "Chromium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_CHROMIUM_ORE, "Deepslate Chromium Ore");
-	   addBlock(Registry.Blocks.MANGANESE_ORE, "Manganese Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_MANGANESE_ORE, "Deepslate Manganese Ore");
-	   addBlock(Registry.Blocks.OSMIUM_ORE, "Osmium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_OSMIUM_ORE, "Deepslate Osmium Ore");
-	   addBlock(Registry.Blocks.PALLADIUM_ORE, "Palladium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_PALLADIUM_ORE, "Deepslate Palladium Ore");
-	   addBlock(Registry.Blocks.THORIUM_ORE, "Thorium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_THORIUM_ORE, "Deepslate Thorium Ore");
-	   addBlock(Registry.Blocks.URANIUM_ORE, "Uranium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_URANIUM_ORE, "Deepslate Uranium Ore");
-	   addBlock(Registry.Blocks.VANADIUM_ORE, "Vanadium Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_VANADIUM_ORE, "Deepslate Vanadium Ore");
-	   addBlock(Registry.Blocks.ZINC_ORE, "Zinc Ore");
-	   addBlock(Registry.Blocks.DEEPSLATE_ZINC_ORE, "Deepslate Zinc Ore");
-	   //endregion
-
+		addBlock(Registry.Blocks.TUNGSTEN_ORE, "Tungsten Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE, "Deepslate Tungsten Ore");
+		addBlock(Registry.Blocks.TITANIUM_ORE, "Titanium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_TITANIUM_ORE, "Deepslate Titanium Ore");
+		addBlock(Registry.Blocks.COBALT_ORE, "Cobalt Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_COBALT_ORE, "Deepslate Cobalt Ore");
+		addBlock(Registry.Blocks.NICKEL_ORE, "Nickel Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_NICKEL_ORE, "Deepslate Nickel Ore");
+		addBlock(Registry.Blocks.BAUXITE_ORE, "Bauxite Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_BAUXITE_ORE, "Deepslate Bauxite Ore");
+		addBlock(Registry.Blocks.MOLYBDENUM_ORE, "Molybdenum Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE, "Deepslate Molybdenum Ore");
+		addBlock(Registry.Blocks.IRIDIUM_ORE, "Iridium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_IRIDIUM_ORE, "Deepslate Iridium Ore");
+		addBlock(Registry.Blocks.LITHIUM_ORE, "Lithium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_LITHIUM_ORE, "Deepslate Lithium Ore");
+		addBlock(Registry.Blocks.PLATINUM_ORE, "Platinum Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_PLATINUM_ORE, "Deepslate Platinum Ore");
+		addBlock(Registry.Blocks.GRAPHITE_ORE, "Graphite Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_GRAPHITE_ORE, "Deepslate Graphite Ore");
+		addBlock(Registry.Blocks.BERYLLIUM_ORE, "Beryllium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE, "Deepslate Beryllium Ore");
+		addBlock(Registry.Blocks.CADMIUM_ORE, "Cadmium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_CADMIUM_ORE, "Deepslate Cadmium Ore");
+		addBlock(Registry.Blocks.CHROMIUM_ORE, "Chromium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_CHROMIUM_ORE, "Deepslate Chromium Ore");
+		addBlock(Registry.Blocks.MANGANESE_ORE, "Manganese Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_MANGANESE_ORE, "Deepslate Manganese Ore");
+		addBlock(Registry.Blocks.OSMIUM_ORE, "Osmium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_OSMIUM_ORE, "Deepslate Osmium Ore");
+		addBlock(Registry.Blocks.PALLADIUM_ORE, "Palladium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_PALLADIUM_ORE, "Deepslate Palladium Ore");
+		addBlock(Registry.Blocks.THORIUM_ORE, "Thorium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_THORIUM_ORE, "Deepslate Thorium Ore");
+		addBlock(Registry.Blocks.URANIUM_ORE, "Uranium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_URANIUM_ORE, "Deepslate Uranium Ore");
+		addBlock(Registry.Blocks.VANADIUM_ORE, "Vanadium Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_VANADIUM_ORE, "Deepslate Vanadium Ore");
+		addBlock(Registry.Blocks.ZINC_ORE, "Zinc Ore");
+		addBlock(Registry.Blocks.DEEPSLATE_ZINC_ORE, "Deepslate Zinc Ore");
+		//endregion
+		
 		//region Items
-	   addItem(Registry.Items.PROSPECTING_PICK, "Prospecting Pick");
-	   addItem(Registry.Items.EMPTY_SAMPLE_TUBE, "Empty Sample Tube");
-	   addItem(Registry.Items.FILLED_SAMPLE_TUBE, "Filled Sample Tube");
-	   addItem(Registry.Items.SCREWDRIVER, "Screwdriver");
-	   //endregion
+		addItem(Registry.Items.PROSPECTING_PICK, "Prospecting Pick");
+		addItem(Registry.Items.EMPTY_SAMPLE_TUBE, "Empty Sample Tube");
+		addItem(Registry.Items.FILLED_SAMPLE_TUBE, "Filled Sample Tube");
+		addItem(Registry.Items.SCREWDRIVER, "Screwdriver");
+		//endregion
 		
 		//region Tooltips
 		add(String.format("tooltip.%s.sample_location.chunk_pos", MOD_ID), "Chunk Sample: [x: %s, z: %s]");
diff --git a/src/main/java/org/darkar/cog_works/generation/world/BiomeModifiers.java b/src/main/java/org/darkar/cog_works/generation/world/BiomeModifiers.java
index 75ae6f3..4b5a3dd 100644
--- a/src/main/java/org/darkar/cog_works/generation/world/BiomeModifiers.java
+++ b/src/main/java/org/darkar/cog_works/generation/world/BiomeModifiers.java
@@ -37,134 +37,115 @@ public class BiomeModifiers {
 	public static final ResourceKey<BiomeModifier> ADD_URANIUM_ORE_MODIFIER = registerKey("uranium_ore");
 	public static final ResourceKey<BiomeModifier> ADD_VANADIUM_ORE_MODIFIER = registerKey("vanadium_ore");
 	public static final ResourceKey<BiomeModifier> ADD_ZINC_ORE_MODIFIER = registerKey("zinc_ore");
-
+	
 	public static void bootstrap(BootstrapContext<BiomeModifier> context) {
-	  HolderGetter<PlacedFeature> placedFeatures =	context.lookup(Registries.PLACED_FEATURE);
-	  HolderGetter<Biome> biomes = context.lookup(Registries.BIOME);
-
-	  context.register(ADD_TUNGSTEN_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.TUNGSTEN_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_TITANIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.TITANIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_COBALT_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.COBALT_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_NICKEL_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.NICKEL_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_PLATINUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.PLATINUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_BAUXITE_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.BAUXITE_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_MOLYBDENUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.MOLYBDENUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_LITHIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.LITHIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_IRIDIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.IRIDIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_GRAPHITE_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.GRAPHITE_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_BERYLLIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.BERYLLIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_CADMIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.CADMIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_CHROMIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.CHROMIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_MANGANESE_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.MANGANESE_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_OSMIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.OSMIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_PALLADIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.PALLADIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_THORIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.THORIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_URANIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.URANIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_VANADIUM_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.VANADIUM_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
-
-	  context.register(ADD_ZINC_ORE_MODIFIER,
-	                   new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
-	                                                HolderSet.direct(placedFeatures.getOrThrow(PlacedFeatures.ZINC_ORE_PLACED_KEY)),
-	                                                GenerationStep.Decoration.UNDERGROUND_ORES
-	                   ));
+		HolderGetter<PlacedFeature> placedFeatures = context.lookup(Registries.PLACED_FEATURE);
+		HolderGetter<Biome> biomes = context.lookup(Registries.BIOME);
+		
+		context.register(ADD_TUNGSTEN_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.TUNGSTEN_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_TITANIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.TITANIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_COBALT_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.COBALT_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_NICKEL_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.NICKEL_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_PLATINUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.PLATINUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_BAUXITE_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.BAUXITE_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_MOLYBDENUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.MOLYBDENUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_LITHIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.LITHIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_IRIDIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.IRIDIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_GRAPHITE_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.GRAPHITE_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_BERYLLIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.BERYLLIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_CADMIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.CADMIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_CHROMIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.CHROMIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_MANGANESE_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.MANGANESE_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_OSMIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.OSMIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_PALLADIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.PALLADIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_THORIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.THORIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_URANIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.URANIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_VANADIUM_ORE_MODIFIER,
+		                 new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(
+			                 placedFeatures.getOrThrow(PlacedFeatures.VANADIUM_ORE_PLACED_KEY)),
+		                                              GenerationStep.Decoration.UNDERGROUND_ORES));
+		
+		context.register(ADD_ZINC_ORE_MODIFIER, new AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD),
+		                                                                     HolderSet.direct(placedFeatures.getOrThrow(
+			                                                                     PlacedFeatures.ZINC_ORE_PLACED_KEY)),
+		                                                                     GenerationStep.Decoration.UNDERGROUND_ORES));
 	}
-
+	
 	private static ResourceKey<BiomeModifier> registerKey(String name) {
-		return ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(MOD_ID, "add_"+name));
+		return ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS,
+		                          ResourceLocation.fromNamespaceAndPath(MOD_ID, "add_" + name));
 	}
-
+	
 }
diff --git a/src/main/java/org/darkar/cog_works/generation/world/ConfiguredFeatures.java b/src/main/java/org/darkar/cog_works/generation/world/ConfiguredFeatures.java
index 2371af2..1edc7f8 100644
--- a/src/main/java/org/darkar/cog_works/generation/world/ConfiguredFeatures.java
+++ b/src/main/java/org/darkar/cog_works/generation/world/ConfiguredFeatures.java
@@ -18,135 +18,224 @@
 import static org.darkar.cog_works.CogWorks.MOD_ID;
 
 public class ConfiguredFeatures {
-
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_TUNGSTEN_ORE_KEY = registerKey("tungsten_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_TITANIUM_ORE_KEY = registerKey("titanium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_COBALT_ORE_KEY = registerKey("cobalt_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_NICKEL_ORE_KEY = registerKey("nickel_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_PLATINUM_ORE_KEY = registerKey("platinum_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_BAUXITE_ORE_KEY = registerKey("bauxite_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_MOLYBDENUM_ORE_KEY = registerKey("molybdenum_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_LITHIUM_ORE_KEY = registerKey("lithium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_IRIDIUM_ORE_KEY = registerKey("iridium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_GRAPHITE_ORE_KEY = registerKey("graphite_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_BERYLLIUM_ORE_KEY = registerKey("beryllium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_CADMIUM_ORE_KEY = registerKey("cadmium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_CHROMIUM_ORE_KEY = registerKey("chromium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_MANGANESE_ORE_KEY = registerKey("manganese_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_OSMIUM_ORE_KEY = registerKey("osmium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_PALLADIUM_ORE_KEY = registerKey("palladium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_THORIUM_ORE_KEY = registerKey("thorium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_URANIUM_ORE_KEY = registerKey("uranium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_VANADIUM_ORE_KEY = registerKey("vanadium_ore");
-	public static final ResourceKey<ConfiguredFeature<?,?>> OVERWORLD_ZINC_ORE_KEY = registerKey("zinc_ore");
-
-
-
-	public static void bootstrap(BootstrapContext<ConfiguredFeature<?,?>> context) {
+	
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_TUNGSTEN_ORE_KEY = registerKey("tungsten_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_TITANIUM_ORE_KEY = registerKey("titanium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_COBALT_ORE_KEY = registerKey("cobalt_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_NICKEL_ORE_KEY = registerKey("nickel_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_PLATINUM_ORE_KEY = registerKey("platinum_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_BAUXITE_ORE_KEY = registerKey("bauxite_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_MOLYBDENUM_ORE_KEY = registerKey(
+		"molybdenum_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_LITHIUM_ORE_KEY = registerKey("lithium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_IRIDIUM_ORE_KEY = registerKey("iridium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_GRAPHITE_ORE_KEY = registerKey("graphite_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_BERYLLIUM_ORE_KEY = registerKey(
+		"beryllium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_CADMIUM_ORE_KEY = registerKey("cadmium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_CHROMIUM_ORE_KEY = registerKey("chromium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_MANGANESE_ORE_KEY = registerKey(
+		"manganese_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_OSMIUM_ORE_KEY = registerKey("osmium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_PALLADIUM_ORE_KEY = registerKey(
+		"palladium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_THORIUM_ORE_KEY = registerKey("thorium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_URANIUM_ORE_KEY = registerKey("uranium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_VANADIUM_ORE_KEY = registerKey("vanadium_ore");
+	public static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_ZINC_ORE_KEY = registerKey("zinc_ore");
+	
+	
+	public static void bootstrap(BootstrapContext<ConfiguredFeature<?, ?>> context) {
 		RuleTest stoneReplaceTest = new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES);
 		RuleTest deepslateReplaceTest = new TagMatchTest(BlockTags.DEEPSLATE_ORE_REPLACEABLES);
-
+		
 		List<OreConfiguration.TargetBlockState> overworldTungstenOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.TUNGSTEN_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.TUNGSTEN_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_TUNGSTEN_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldTitaniumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.TITANIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_TITANIUM_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldCobaltOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.COBALT_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_COBALT_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldNickelOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.NICKEL_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_NICKEL_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.TITANIUM_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_TITANIUM_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldCobaltOres = List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                              Registry.Blocks.COBALT_ORE
+			                                                                                              .get()
+			                                                                                              .defaultBlockState()),
+		                                                                      OreConfiguration.target(
+			                                                                      deepslateReplaceTest,
+			                                                                      Registry.Blocks.DEEPSLATE_COBALT_ORE
+				                                                                      .get()
+				                                                                      .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldNickelOres = List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                              Registry.Blocks.NICKEL_ORE
+			                                                                                              .get()
+			                                                                                              .defaultBlockState()),
+		                                                                      OreConfiguration.target(
+			                                                                      deepslateReplaceTest,
+			                                                                      Registry.Blocks.DEEPSLATE_NICKEL_ORE
+				                                                                      .get()
+				                                                                      .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldPlatinumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.PLATINUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_PLATINUM_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldBauxiteOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.BAUXITE_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_BAUXITE_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.PLATINUM_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_PLATINUM_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldBauxiteOres =
+			List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                               Registry.Blocks.BAUXITE_ORE
+			                                                                                               .get()
+			                                                                                               .defaultBlockState()),
+		                                                                       OreConfiguration.target(
+			                                                                       deepslateReplaceTest,
+			                                                                       Registry.Blocks.DEEPSLATE_BAUXITE_ORE
+				                                                                       .get()
+				                                                                       .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldMolybdenumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.MOLYBDENUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldLithiumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.LITHIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_LITHIUM_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldIridiumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.IRIDIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_IRIDIUM_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.MOLYBDENUM_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_MOLYBDENUM_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldLithiumOres =
+			List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                               Registry.Blocks.LITHIUM_ORE
+			                                                                                               .get()
+			                                                                                               .defaultBlockState()),
+		                                                                       OreConfiguration.target(
+			                                                                       deepslateReplaceTest,
+			                                                                       Registry.Blocks.DEEPSLATE_LITHIUM_ORE
+				                                                                       .get()
+				                                                                       .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldIridiumOres =
+			List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                               Registry.Blocks.IRIDIUM_ORE
+			                                                                                               .get()
+			                                                                                               .defaultBlockState()),
+		                                                                       OreConfiguration.target(
+			                                                                       deepslateReplaceTest,
+			                                                                       Registry.Blocks.DEEPSLATE_IRIDIUM_ORE
+				                                                                       .get()
+				                                                                       .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldGraphiteOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.GRAPHITE_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_GRAPHITE_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.GRAPHITE_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_GRAPHITE_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldBerylliumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.BERYLLIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE.get().defaultBlockState())
-		                                                                       );
-
-		List<OreConfiguration.TargetBlockState> overworldCadmiumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.CADMIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_CADMIUM_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.BERYLLIUM_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_BERYLLIUM_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldCadmiumOres =
+			List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                               Registry.Blocks.CADMIUM_ORE
+			                                                                                               .get()
+			                                                                                               .defaultBlockState()),
+		                                                                       OreConfiguration.target(
+			                                                                       deepslateReplaceTest,
+			                                                                       Registry.Blocks.DEEPSLATE_CADMIUM_ORE
+				                                                                       .get()
+				                                                                       .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldChromiumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.CHROMIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_CHROMIUM_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.CHROMIUM_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_CHROMIUM_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldManganeseOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.MANGANESE_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_MANGANESE_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldOsmiumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.OSMIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_OSMIUM_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.MANGANESE_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_MANGANESE_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldOsmiumOres = List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                              Registry.Blocks.OSMIUM_ORE
+			                                                                                              .get()
+			                                                                                              .defaultBlockState()),
+		                                                                      OreConfiguration.target(
+			                                                                      deepslateReplaceTest,
+			                                                                      Registry.Blocks.DEEPSLATE_OSMIUM_ORE
+				                                                                      .get()
+				                                                                      .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldPalladiumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.PALLADIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_PALLADIUM_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldThoriumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.THORIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_THORIUM_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldUraniumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.URANIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_URANIUM_ORE.get().defaultBlockState())
-		);
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.PALLADIUM_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_PALLADIUM_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldThoriumOres =
+			List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                               Registry.Blocks.THORIUM_ORE
+			                                                                                               .get()
+			                                                                                               .defaultBlockState()),
+		                                                                       OreConfiguration.target(
+			                                                                       deepslateReplaceTest,
+			                                                                       Registry.Blocks.DEEPSLATE_THORIUM_ORE
+				                                                                       .get()
+				                                                                       .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldUraniumOres =
+			List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                               Registry.Blocks.URANIUM_ORE
+			                                                                                               .get()
+			                                                                                               .defaultBlockState()),
+		                                                                       OreConfiguration.target(
+			                                                                       deepslateReplaceTest,
+			                                                                       Registry.Blocks.DEEPSLATE_URANIUM_ORE
+				                                                                       .get()
+				                                                                       .defaultBlockState()));
+		
 		List<OreConfiguration.TargetBlockState> overworldVanadiumOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.VANADIUM_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_VANADIUM_ORE.get().defaultBlockState())
-		);
-
-		List<OreConfiguration.TargetBlockState> overworldZincOres = List.of(
-			OreConfiguration.target(stoneReplaceTest,Registry.Blocks.ZINC_ORE.get().defaultBlockState()),
-			OreConfiguration.target(deepslateReplaceTest,Registry.Blocks.DEEPSLATE_ZINC_ORE.get().defaultBlockState())
-		);
-
-
+			OreConfiguration.target(stoneReplaceTest, Registry.Blocks.VANADIUM_ORE
+				.get()
+				.defaultBlockState()), OreConfiguration.target(deepslateReplaceTest,
+			                                                   Registry.Blocks.DEEPSLATE_VANADIUM_ORE
+				                                                   .get()
+				                                                   .defaultBlockState()));
+		
+		List<OreConfiguration.TargetBlockState> overworldZincOres = List.of(OreConfiguration.target(stoneReplaceTest,
+		                                                                                            Registry.Blocks.ZINC_ORE
+			                                                                                            .get()
+			                                                                                            .defaultBlockState()),
+		                                                                    OreConfiguration.target(
+			                                                                    deepslateReplaceTest,
+			                                                                    Registry.Blocks.DEEPSLATE_ZINC_ORE
+				                                                                    .get()
+				                                                                    .defaultBlockState()));
+		
+		
 		register(context, OVERWORLD_TUNGSTEN_ORE_KEY, Feature.ORE, new OreConfiguration(overworldTungstenOres, 4));
 		register(context, OVERWORLD_TITANIUM_ORE_KEY, Feature.ORE, new OreConfiguration(overworldTitaniumOres, 6));
 		register(context, OVERWORLD_COBALT_ORE_KEY, Feature.ORE, new OreConfiguration(overworldCobaltOres, 5));
@@ -168,16 +257,17 @@ public static void bootstrap(BootstrapContext<ConfiguredFeature<?,?>> context) {
 		register(context, OVERWORLD_VANADIUM_ORE_KEY, Feature.ORE, new OreConfiguration(overworldVanadiumOres, 2));
 		register(context, OVERWORLD_ZINC_ORE_KEY, Feature.ORE, new OreConfiguration(overworldZincOres, 6));
 	}
-
-
-
+	
+	
 	public static ResourceKey<ConfiguredFeature<?, ?>> registerKey(String name) {
-		return ResourceKey.create(Registries.CONFIGURED_FEATURE, new ResourceLocation(MOD_ID, name));
+		return ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.fromNamespaceAndPath(MOD_ID, name));
 	}
-
-	private static <FC extends FeatureConfiguration, F extends Feature<FC>> void register(BootstrapContext<ConfiguredFeature<?, ?>> context,
-	                                                                                      ResourceKey<ConfiguredFeature<?, ?>> key, F feature, FC configuration) {
+	
+	private static <FC extends FeatureConfiguration, F extends Feature<FC>> void register(
+		BootstrapContext<ConfiguredFeature<?, ?>> context, ResourceKey<ConfiguredFeature<?, ?>> key, F feature,
+		FC configuration)
+	{
 		context.register(key, new ConfiguredFeature<>(feature, configuration));
-
+		
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/generation/world/OrePlacement.java b/src/main/java/org/darkar/cog_works/generation/world/OrePlacement.java
index a83f198..de9da11 100644
--- a/src/main/java/org/darkar/cog_works/generation/world/OrePlacement.java
+++ b/src/main/java/org/darkar/cog_works/generation/world/OrePlacement.java
@@ -6,14 +6,15 @@
 
 public class OrePlacement {
 	public static List<PlacementModifier> orePlacement(PlacementModifier pCountPlacement,
-	                                                 PlacementModifier pHeightRange) {
+	                                                   PlacementModifier pHeightRange)
+	{
 		return List.of(pCountPlacement, InSquarePlacement.spread(), pHeightRange, BiomeFilter.biome());
 	}
-
+	
 	public static List<PlacementModifier> commonOrePlacement(int pCount, PlacementModifier pHeightRange) {
 		return orePlacement(CountPlacement.of(pCount), pHeightRange);
 	}
-
+	
 	public static List<PlacementModifier> rareOrePlacement(int pChance, PlacementModifier pHeightRange) {
 		return orePlacement(RarityFilter.onAverageOnceEvery(pChance), pHeightRange);
 	}
diff --git a/src/main/java/org/darkar/cog_works/generation/world/PlacedFeatures.java b/src/main/java/org/darkar/cog_works/generation/world/PlacedFeatures.java
index 0a3232f..cb2740a 100644
--- a/src/main/java/org/darkar/cog_works/generation/world/PlacedFeatures.java
+++ b/src/main/java/org/darkar/cog_works/generation/world/PlacedFeatures.java
@@ -17,7 +17,7 @@
 import static org.darkar.cog_works.CogWorks.MOD_ID;
 
 public class PlacedFeatures {
-
+	
 	public static final ResourceKey<PlacedFeature> TUNGSTEN_ORE_PLACED_KEY = registerKey("tungsten_ore");
 	public static final ResourceKey<PlacedFeature> TITANIUM_ORE_PLACED_KEY = registerKey("titanium_ore");
 	public static final ResourceKey<PlacedFeature> COBALT_ORE_PLACED_KEY = registerKey("cobalt_ore");
@@ -38,84 +38,103 @@ public class PlacedFeatures {
 	public static final ResourceKey<PlacedFeature> URANIUM_ORE_PLACED_KEY = registerKey("uranium_ore");
 	public static final ResourceKey<PlacedFeature> VANADIUM_ORE_PLACED_KEY = registerKey("vanadium_ore");
 	public static final ResourceKey<PlacedFeature> ZINC_ORE_PLACED_KEY = registerKey("zinc_ore");
-
-
-
+	
+	
 	public static void bootstrap(BootstrapContext<PlacedFeature> context) {
-		HolderGetter<ConfiguredFeature<?,?>> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE);
-
+		HolderGetter<ConfiguredFeature<?, ?>> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE);
+		
 		register(context, TUNGSTEN_ORE_PLACED_KEY,
 		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_TUNGSTEN_ORE_KEY),
 		         OrePlacement.commonOrePlacement(3, HeightRangePlacement.uniform(VerticalAnchor.absolute(-40),
-		                                                                        VerticalAnchor.absolute(60))));
-		register(context, TITANIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_TITANIUM_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(60))));
+		register(context, TITANIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_TITANIUM_ORE_KEY),
 		         OrePlacement.commonOrePlacement(4, HeightRangePlacement.uniform(VerticalAnchor.absolute(-30),
-		                                                                        VerticalAnchor.absolute(80))));
-		register(context, COBALT_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_COBALT_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(80))));
+		register(context, COBALT_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_COBALT_ORE_KEY),
 		         OrePlacement.commonOrePlacement(3, HeightRangePlacement.uniform(VerticalAnchor.absolute(-20),
-		                                                                        VerticalAnchor.absolute(45))));
-		register(context, NICKEL_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_NICKEL_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(45))));
+		register(context, NICKEL_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_NICKEL_ORE_KEY),
 		         OrePlacement.commonOrePlacement(4, HeightRangePlacement.triangle(VerticalAnchor.absolute(-40),
-		                                                                        VerticalAnchor.absolute(60))));
-		register(context, PLATINUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_PLATINUM_ORE_KEY),
+		                                                                          VerticalAnchor.absolute(60))));
+		register(context, PLATINUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_PLATINUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(8, HeightRangePlacement.triangle(VerticalAnchor.absolute(-50),
 		                                                                        VerticalAnchor.absolute(40))));
-		register(context, BAUXITE_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_BAUXITE_ORE_KEY),
+		register(context, BAUXITE_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_BAUXITE_ORE_KEY),
 		         OrePlacement.commonOrePlacement(3, HeightRangePlacement.uniform(VerticalAnchor.absolute(-64),
-		                                                                        VerticalAnchor.absolute(80))));
-		register(context, MOLYBDENUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_MOLYBDENUM_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(80))));
+		register(context, MOLYBDENUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_MOLYBDENUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(8, HeightRangePlacement.uniform(VerticalAnchor.absolute(-30),
-		                                                                        VerticalAnchor.absolute(50))));
-		register(context, LITHIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_LITHIUM_ORE_KEY),
+		                                                                       VerticalAnchor.absolute(50))));
+		register(context, LITHIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_LITHIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(3, HeightRangePlacement.uniform(VerticalAnchor.absolute(-10),
-		                                                                        VerticalAnchor.absolute(40))));
-		register(context, IRIDIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_IRIDIUM_ORE_KEY),
+		                                                                       VerticalAnchor.absolute(40))));
+		register(context, IRIDIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_IRIDIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(10, HeightRangePlacement.uniform(VerticalAnchor.absolute(-60),
 		                                                                        VerticalAnchor.absolute(30))));
-		register(context, GRAPHITE_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_GRAPHITE_ORE_KEY),
+		register(context, GRAPHITE_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_GRAPHITE_ORE_KEY),
 		         OrePlacement.commonOrePlacement(1, HeightRangePlacement.triangle(VerticalAnchor.absolute(-64),
-		                                                                        VerticalAnchor.absolute(64))));
-		register(context, BERYLLIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_BERYLLIUM_ORE_KEY),
+		                                                                          VerticalAnchor.absolute(64))));
+		register(context, BERYLLIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_BERYLLIUM_ORE_KEY),
 		         OrePlacement.commonOrePlacement(3, HeightRangePlacement.uniform(VerticalAnchor.absolute(-10),
-		                                                                        VerticalAnchor.absolute(40))));
-		register(context, CADMIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_CADMIUM_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(40))));
+		register(context, CADMIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_CADMIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(10, HeightRangePlacement.triangle(VerticalAnchor.absolute(-20),
-		                                                                        VerticalAnchor.absolute(30))));
-		register(context, CHROMIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_CHROMIUM_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(30))));
+		register(context, CHROMIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_CHROMIUM_ORE_KEY),
 		         OrePlacement.commonOrePlacement(3, HeightRangePlacement.uniform(VerticalAnchor.absolute(10),
-		                                                                        VerticalAnchor.absolute(60))));
-		register(context, MANGANESE_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_MANGANESE_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(60))));
+		register(context, MANGANESE_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_MANGANESE_ORE_KEY),
 		         OrePlacement.commonOrePlacement(5, HeightRangePlacement.uniform(VerticalAnchor.absolute(30),
-		                                                                        VerticalAnchor.absolute(80))));
-		register(context, OSMIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_OSMIUM_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(80))));
+		register(context, OSMIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_OSMIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(12, HeightRangePlacement.triangle(VerticalAnchor.absolute(-40),
-		                                                                        VerticalAnchor.absolute(10))));
-		register(context, PALLADIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_PALLADIUM_ORE_KEY),
+		                                                                         VerticalAnchor.absolute(10))));
+		register(context, PALLADIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_PALLADIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(9, HeightRangePlacement.triangle(VerticalAnchor.absolute(-20),
 		                                                                        VerticalAnchor.absolute(50))));
-		register(context, THORIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_THORIUM_ORE_KEY),
+		register(context, THORIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_THORIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(9, HeightRangePlacement.triangle(VerticalAnchor.absolute(-50),
 		                                                                        VerticalAnchor.absolute(20))));
-		register(context, URANIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_URANIUM_ORE_KEY),
+		register(context, URANIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_URANIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(8, HeightRangePlacement.triangle(VerticalAnchor.absolute(-30),
 		                                                                        VerticalAnchor.absolute(30))));
-		register(context, VANADIUM_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_VANADIUM_ORE_KEY),
+		register(context, VANADIUM_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_VANADIUM_ORE_KEY),
 		         OrePlacement.rareOrePlacement(7, HeightRangePlacement.triangle(VerticalAnchor.absolute(40),
 		                                                                        VerticalAnchor.absolute(90))));
-		register(context, ZINC_ORE_PLACED_KEY, configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_ZINC_ORE_KEY),
+		register(context, ZINC_ORE_PLACED_KEY,
+		         configuredFeatures.getOrThrow(ConfiguredFeatures.OVERWORLD_ZINC_ORE_KEY),
 		         OrePlacement.commonOrePlacement(4, HeightRangePlacement.uniform(VerticalAnchor.absolute(20),
-		                                                                        VerticalAnchor.absolute(70))));
-
+		                                                                         VerticalAnchor.absolute(70))));
+		
 	}
-
-
+	
+	
 	private static ResourceKey<PlacedFeature> registerKey(String name) {
-		return ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(MOD_ID, name+"_placed"));
+		return ResourceKey.create(Registries.PLACED_FEATURE,
+		                          ResourceLocation.fromNamespaceAndPath(MOD_ID, name + "_placed"));
 	}
-
+	
 	private static void register(BootstrapContext<PlacedFeature> context, ResourceKey<PlacedFeature> key,
-	                             Holder<ConfiguredFeature<?, ?>> configuration,
-	                             List<PlacementModifier> modifiers) {
+	                             Holder<ConfiguredFeature<?, ?>> configuration, List<PlacementModifier> modifiers)
+	{
 		context.register(key, new PlacedFeature(configuration, List.copyOf(modifiers)));
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/item/EmptySampleTubeItem.java b/src/main/java/org/darkar/cog_works/item/EmptySampleTubeItem.java
index e02ab9f..b8d9e57 100644
--- a/src/main/java/org/darkar/cog_works/item/EmptySampleTubeItem.java
+++ b/src/main/java/org/darkar/cog_works/item/EmptySampleTubeItem.java
@@ -28,7 +28,9 @@
 
 public class EmptySampleTubeItem extends Item implements GeoItem {
 	
-	private static final RawAnimation OPEN_LID = RawAnimation.begin().thenPlay("animation.empty_sample_tube.open_lid");
+	private static final RawAnimation OPEN_LID = RawAnimation
+		.begin()
+		.thenPlay("animation.empty_sample_tube.open_lid");
 	
 	private static final Properties itemProperties = new Properties().stacksTo(32);
 	
@@ -69,13 +71,12 @@ public void registerControllers(AnimatableManager.ControllerRegistrar controller
 	}
 	
 	
-	public void handleSampleCollection(ChunkPos collectedChunkPos, SampleSiteRegion region, Player player, Level level) {
-		if(level instanceof ServerLevel serverLevel) {
+	public void handleSampleCollection(ChunkPos collectedChunkPos, SampleSiteRegion region, Player player, Level level)
+	{
+		if (level instanceof ServerLevel serverLevel) {
 			ItemStack stack = player.getItemInHand(InteractionHand.OFF_HAND);
 			
-			triggerAnim(player,
-			            GeoItem.getOrAssignId(stack, serverLevel),
-			            "open_lid_controller", "open_lid");
+			triggerAnim(player, GeoItem.getOrAssignId(stack, serverLevel), "open_lid_controller", "open_lid");
 			
 			stack.setCount(stack.getCount() - 1);
 			ItemStack filledSampleTube = new ItemStack(Registry.Items.FILLED_SAMPLE_TUBE.get(), 1);
diff --git a/src/main/java/org/darkar/cog_works/item/FilledSampleTubeItem.java b/src/main/java/org/darkar/cog_works/item/FilledSampleTubeItem.java
index 393f349..4a1d871 100644
--- a/src/main/java/org/darkar/cog_works/item/FilledSampleTubeItem.java
+++ b/src/main/java/org/darkar/cog_works/item/FilledSampleTubeItem.java
@@ -25,9 +25,12 @@
 import static org.darkar.cog_works.Registry.Items.DataComponents.SAMPLE_LOCATION;
 
 public class FilledSampleTubeItem extends Item implements GeoItem {
-	private static final RawAnimation OPEN_LID = RawAnimation.begin().thenPlay("animation.filled_sample_tube.open_lid");
+	private static final RawAnimation OPEN_LID = RawAnimation
+		.begin()
+		.thenPlay("animation.filled_sample_tube.open_lid");
 	
-	private static final Properties itemProperties = new Properties().stacksTo(1)
+	private static final Properties itemProperties = new Properties()
+		.stacksTo(1)
 		.component(SAMPLE_LOCATION, SampleLocation.DEFAULT);
 	
 	private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
@@ -70,13 +73,18 @@ public void registerControllers(AnimatableManager.ControllerRegistrar controller
 	public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> componentList,
 	                            TooltipFlag tooltipFlag)
 	{
-		boolean hasLocation = stack.has(SAMPLE_LOCATION) && !stack.get(SAMPLE_LOCATION).equals(SampleLocation.DEFAULT);
+		boolean hasLocation = stack.has(SAMPLE_LOCATION) && !stack
+			.get(SAMPLE_LOCATION)
+			.equals(SampleLocation.DEFAULT);
 		if (hasLocation) {
 			SampleLocation location = stack.get(SAMPLE_LOCATION);
-			MutableComponent chunkText = Component.translatable(String.format("tooltip.%s.sample_location.chunk_pos",
-			                                                                  MOD_ID), location.chunkPos().x, location.chunkPos().z);
-			MutableComponent regionText = Component.translatable(String.format("tooltip.%s.sample_location.region",
-			                                                                   MOD_ID), location.region().name());
+			MutableComponent chunkText = Component.translatable(
+				String.format("tooltip.%s.sample_location.chunk_pos", MOD_ID), location.chunkPos().x,
+				location.chunkPos().z);
+			MutableComponent regionText = Component.translatable(
+				String.format("tooltip.%s.sample_location.region", MOD_ID), location
+					.region()
+					.name());
 			
 			componentList.add(chunkText);
 			componentList.add(regionText);
diff --git a/src/main/java/org/darkar/cog_works/item/ProspectingPickItem.java b/src/main/java/org/darkar/cog_works/item/ProspectingPickItem.java
index 6a58eb8..25ddc30 100644
--- a/src/main/java/org/darkar/cog_works/item/ProspectingPickItem.java
+++ b/src/main/java/org/darkar/cog_works/item/ProspectingPickItem.java
@@ -47,12 +47,16 @@
 
 public class ProspectingPickItem extends Item implements GeoItem, IItemExtension {
 	
-	private static final RawAnimation DIG_SAMPLE = RawAnimation.begin().thenPlay(
-		"animation.prospecting_pick.dig_sample");
-	private static final RawAnimation COLLECT_SAMPLE = RawAnimation.begin().thenPlay(
-		"animation.prospecting_pick.collect_sample");
-	private static final Properties itemProperties = new Properties().stacksTo(1).durability(128).component(
-		IS_DIGGING_SAMPLE, IsDiggingSample.DEFAULT);
+	private static final RawAnimation DIG_SAMPLE = RawAnimation
+		.begin()
+		.thenPlay("animation.prospecting_pick.dig_sample");
+	private static final RawAnimation COLLECT_SAMPLE = RawAnimation
+		.begin()
+		.thenPlay("animation.prospecting_pick.collect_sample");
+	private static final Properties itemProperties = new Properties()
+		.stacksTo(1)
+		.durability(128)
+		.component(IS_DIGGING_SAMPLE, IsDiggingSample.DEFAULT);
 	private static final int COOLDOWN_TICKS = 8 * 20;
 	
 	private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
@@ -124,7 +128,7 @@ public InteractionResult useOn(UseOnContext pContext) {
 				
 				boolean hasSampleTubeOnHand = offHandStack.getItem() instanceof EmptySampleTubeItem;
 				
-				if(!hasSampleTubeOnHand) return InteractionResult.FAIL;
+				if (!hasSampleTubeOnHand) return InteractionResult.FAIL;
 				
 				EmptySampleTubeItem emptySampleTubeItem = (EmptySampleTubeItem) offHandStack.getItem();
 				
@@ -142,8 +146,9 @@ public InteractionResult useOn(UseOnContext pContext) {
 				                                                                                chunkSampleSiteMap);
 				PacketDistributor.sendToPlayersTrackingChunk(serverLevel, chunk.getPos(), payload);
 				
-				triggerAnim(player, GeoItem.getOrAssignId(player.getItemInHand(InteractionHand.MAIN_HAND), serverLevel),
-				           "collect_sample_controller", "collect_sample");
+				triggerAnim(player, GeoItem.getOrAssignId(player.getItemInHand(InteractionHand.MAIN_HAND),
+				                                          serverLevel),
+				            "collect_sample_controller", "collect_sample");
 				
 				setDamage(player.getItemInHand(InteractionHand.MAIN_HAND),
 				          getDamage(player.getItemInHand(InteractionHand.MAIN_HAND)) + 1);
@@ -192,13 +197,18 @@ public void handleLeftClickBlock(Player player, Level level, BlockPos pos, Direc
 				ChunkSampleSiteMap chunkSampleSiteMap = chunk.getData(CHUNK_SAMPLE_SITE_MAP);
 				switch (region.get()) {
 					case SURFACE -> {
-						boolean needsCollection = !chunkSampleSiteMap.surfacePos().equals(BlockPos.ZERO) &&
-						                          (!chunkSampleSiteMap.surfaceState().isAir() &&
-						                           serverLevel.getBlockState(chunkSampleSiteMap.surfacePos()).is(
-							                           tagsPerRegion.get(SampleSiteRegion.SURFACE)));
+						boolean needsCollection = !chunkSampleSiteMap
+							.surfacePos()
+							.equals(BlockPos.ZERO) && (!chunkSampleSiteMap
+							.surfaceState()
+							.isAir() && serverLevel
+								                           .getBlockState(chunkSampleSiteMap.surfacePos())
+								                           .is(tagsPerRegion.get(SampleSiteRegion.SURFACE)));
 						
 						itemStack.set(IS_DIGGING_SAMPLE, isDiggingSample);
-						player.getCooldowns().addCooldown(this, COOLDOWN_TICKS);
+						player
+							.getCooldowns()
+							.addCooldown(this, COOLDOWN_TICKS);
 						if (needsCollection) {
 							String message = String.format(
 								"This chunk already has a surface sampling site. Please collect the surface sample " +
@@ -223,13 +233,18 @@ public void handleLeftClickBlock(Player player, Level level, BlockPos pos, Direc
 					}
 					
 					case DEEP -> {
-						boolean needsCollection = !chunkSampleSiteMap.deepPos().equals(BlockPos.ZERO) &&
-						                          (!chunkSampleSiteMap.deepState().isAir() && serverLevel.getBlockState(
-							                          chunkSampleSiteMap.deepPos()).is(
-							                          tagsPerRegion.get(SampleSiteRegion.DEEP)));
+						boolean needsCollection = !chunkSampleSiteMap
+							.deepPos()
+							.equals(BlockPos.ZERO) && (!chunkSampleSiteMap
+							.deepState()
+							.isAir() && serverLevel
+								                           .getBlockState(chunkSampleSiteMap.deepPos())
+								                           .is(tagsPerRegion.get(SampleSiteRegion.DEEP)));
 						
 						itemStack.set(IS_DIGGING_SAMPLE, isDiggingSample);
-						player.getCooldowns().addCooldown(this, COOLDOWN_TICKS);
+						player
+							.getCooldowns()
+							.addCooldown(this, COOLDOWN_TICKS);
 						if (needsCollection) {
 							String message = String.format(
 								"This chunk already has a deep sampling site. Please collect the deep sample at %s " +
diff --git a/src/main/java/org/darkar/cog_works/item/ScrewdriverItem.java b/src/main/java/org/darkar/cog_works/item/ScrewdriverItem.java
index 2fa0690..e289998 100644
--- a/src/main/java/org/darkar/cog_works/item/ScrewdriverItem.java
+++ b/src/main/java/org/darkar/cog_works/item/ScrewdriverItem.java
@@ -17,13 +17,17 @@
 
 
 public class ScrewdriverItem extends Item implements GeoItem {
-	private static final RawAnimation USE = RawAnimation.begin().thenPlay(
-		"animation.screwdriver.use");
+	private static final RawAnimation USE = RawAnimation
+		.begin()
+		.thenPlay("animation.screwdriver.use");
 	
-	private static final Properties itemProperties = new Properties().stacksTo(1).durability(128);
+	private static final Properties itemProperties = new Properties()
+		.stacksTo(1)
+		.durability(128);
 	private static final int COOLDOWN_TICKS = 3 * 20;
 	
 	private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
+	
 	public ScrewdriverItem() {
 		super(itemProperties);
 		SingletonGeoAnimatable.registerSyncedAnimatable(this);
@@ -53,8 +57,8 @@ public AnimatableInstanceCache getAnimatableInstanceCache() {
 	@Override
 	public void registerControllers(AnimatableManager.ControllerRegistrar controllers) {
 		controllers.add(
-			new AnimationController<>(this, "use_controller", 20, state -> PlayState.STOP).triggerableAnim(
-				"use", USE));
+			new AnimationController<>(this, "use_controller", 20, state -> PlayState.STOP).triggerableAnim("use",
+			                                                                                               USE));
 	}
 	
 }
diff --git a/src/main/java/org/darkar/cog_works/item/component/IsDiggingSample.java b/src/main/java/org/darkar/cog_works/item/component/IsDiggingSample.java
index 9c44422..5400945 100644
--- a/src/main/java/org/darkar/cog_works/item/component/IsDiggingSample.java
+++ b/src/main/java/org/darkar/cog_works/item/component/IsDiggingSample.java
@@ -7,18 +7,19 @@
 import net.minecraft.network.codec.StreamCodec;
 
 public record IsDiggingSample(boolean value) {
-
+	
 	public static final IsDiggingSample DEFAULT = new IsDiggingSample(false);
 	public static final IsDiggingSample ACTIVE = new IsDiggingSample(true);
-
-	public static final Codec<IsDiggingSample> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-		Codec.BOOL.fieldOf("value").forGetter(IsDiggingSample::value)
-		).apply(instance, IsDiggingSample::new));
-
-
-	public static final StreamCodec<ByteBuf, IsDiggingSample> STREAM_CODEC = StreamCodec.composite(
-		ByteBufCodecs.BOOL, IsDiggingSample::value,
-		IsDiggingSample::new
-	                                                                                              );
-
+	
+	public static final Codec<IsDiggingSample> CODEC = RecordCodecBuilder.create(instance -> instance
+		.group(Codec.BOOL
+			       .fieldOf("value")
+			       .forGetter(IsDiggingSample::value))
+		.apply(instance, IsDiggingSample::new));
+	
+	
+	public static final StreamCodec<ByteBuf, IsDiggingSample> STREAM_CODEC = StreamCodec.composite(ByteBufCodecs.BOOL,
+	                                                                                               IsDiggingSample::value,
+	                                                                                               IsDiggingSample::new);
+	
 }
diff --git a/src/main/java/org/darkar/cog_works/item/component/SampleLocation.java b/src/main/java/org/darkar/cog_works/item/component/SampleLocation.java
index 4a01b8e..575edb9 100644
--- a/src/main/java/org/darkar/cog_works/item/component/SampleLocation.java
+++ b/src/main/java/org/darkar/cog_works/item/component/SampleLocation.java
@@ -12,14 +12,17 @@ public record SampleLocation(ChunkPos chunkPos, SampleSiteRegion region) {
 	
 	public static final SampleLocation DEFAULT = new SampleLocation(ChunkPos.ZERO, SampleSiteRegion.SURFACE);
 	
-	public static final Codec<SampleLocation> CODEC = RecordCodecBuilder.create(
-		instance -> instance.group(Codec.LONG.xmap(ChunkPos::new, ChunkPos::toLong).fieldOf("chunkPos")
-		                                     .forGetter(SampleLocation::chunkPos),
-		                           SampleSiteRegion.CODEC.fieldOf("region").forGetter(SampleLocation::region))
-		                    .apply(instance, SampleLocation::new));
+	public static final Codec<SampleLocation> CODEC = RecordCodecBuilder.create(instance -> instance
+		.group(Codec.LONG
+			       .xmap(ChunkPos::new, ChunkPos::toLong)
+			       .fieldOf("chunkPos")
+			       .forGetter(SampleLocation::chunkPos), SampleSiteRegion.CODEC
+			       .fieldOf("region")
+			       .forGetter(SampleLocation::region))
+		.apply(instance, SampleLocation::new));
 	
 	public static final StreamCodec<FriendlyByteBuf, SampleLocation> STREAM_CODEC = StreamCodec.composite(
-		NeoForgeStreamCodecs.CHUNK_POS, SampleLocation::chunkPos,
-		SampleSiteRegion.STREAM_CODEC, SampleLocation::region,
+		NeoForgeStreamCodecs.CHUNK_POS, SampleLocation::chunkPos, SampleSiteRegion.STREAM_CODEC,
+		SampleLocation::region,
 		SampleLocation::new);
 }
diff --git a/src/main/java/org/darkar/cog_works/item/events/ItemEvents.java b/src/main/java/org/darkar/cog_works/item/events/ItemEvents.java
index 83b9b8f..66f024f 100644
--- a/src/main/java/org/darkar/cog_works/item/events/ItemEvents.java
+++ b/src/main/java/org/darkar/cog_works/item/events/ItemEvents.java
@@ -16,7 +16,7 @@
 
 @EventBusSubscriber(modid = MOD_ID)
 public class ItemEvents {
-
+	
 	@SubscribeEvent
 	public static void onPlayerLeftClickBlock(PlayerInteractEvent.LeftClickBlock event) {
 		ItemStack itemStack = event.getItemStack();
@@ -27,20 +27,21 @@ public static void onPlayerLeftClickBlock(PlayerInteractEvent.LeftClickBlock eve
 		Direction face = event.getFace();
 		LogicalSide side = event.getSide();
 		PlayerInteractEvent.LeftClickBlock.Action action = event.getAction();
-
-
+		
+		
 		if (itemStack.isEmpty()) return;
 		if (item instanceof ProspectingPickItem) {
 			if (side.isServer()) {
-				if(!player.isCreative() && action == PlayerInteractEvent.LeftClickBlock.Action.START) {
-					if(!event.isCanceled()) ((ProspectingPickItem) item).handleLeftClickBlock(player, level, pos, face);
+				if (!player.isCreative() && action == PlayerInteractEvent.LeftClickBlock.Action.START) {
+					if (!event.isCanceled()) ((ProspectingPickItem) item).handleLeftClickBlock(player, level, pos,
+					                                                                           face);
 					event.setCanceled(true);
 				}
 				return;
 			}
-
-			if(side.isClient()) event.setCanceled(true);
+			
+			if (side.isClient()) event.setCanceled(true);
 		}
 	}
-
+	
 }
diff --git a/src/main/java/org/darkar/cog_works/item/renderer/EmptySampleTubeItemRenderer.java b/src/main/java/org/darkar/cog_works/item/renderer/EmptySampleTubeItemRenderer.java
index 0a2fa02..56a73bc 100644
--- a/src/main/java/org/darkar/cog_works/item/renderer/EmptySampleTubeItemRenderer.java
+++ b/src/main/java/org/darkar/cog_works/item/renderer/EmptySampleTubeItemRenderer.java
@@ -12,7 +12,7 @@
 
 public class EmptySampleTubeItemRenderer extends GeoItemRenderer<EmptySampleTubeItem> {
 	public EmptySampleTubeItemRenderer() {
-		super(new DefaultedItemGeoModel<>(new ResourceLocation(MOD_ID, "empty_sample_tube")));
+		super(new DefaultedItemGeoModel<>(ResourceLocation.fromNamespaceAndPath(MOD_ID, "empty_sample_tube")));
 	}
 	
 	@Override
diff --git a/src/main/java/org/darkar/cog_works/item/renderer/FilledSampleTubeItemRenderer.java b/src/main/java/org/darkar/cog_works/item/renderer/FilledSampleTubeItemRenderer.java
index a181e6d..31a898c 100644
--- a/src/main/java/org/darkar/cog_works/item/renderer/FilledSampleTubeItemRenderer.java
+++ b/src/main/java/org/darkar/cog_works/item/renderer/FilledSampleTubeItemRenderer.java
@@ -12,7 +12,7 @@
 
 public class FilledSampleTubeItemRenderer extends GeoItemRenderer<FilledSampleTubeItem> {
 	public FilledSampleTubeItemRenderer() {
-		super(new DefaultedItemGeoModel<>(new ResourceLocation(MOD_ID, "filled_sample_tube")));
+		super(new DefaultedItemGeoModel<>(ResourceLocation.fromNamespaceAndPath(MOD_ID, "filled_sample_tube")));
 	}
 	
 	@Override
diff --git a/src/main/java/org/darkar/cog_works/item/renderer/ProspectingPickItemRenderer.java b/src/main/java/org/darkar/cog_works/item/renderer/ProspectingPickItemRenderer.java
index f38648d..3a37e59 100644
--- a/src/main/java/org/darkar/cog_works/item/renderer/ProspectingPickItemRenderer.java
+++ b/src/main/java/org/darkar/cog_works/item/renderer/ProspectingPickItemRenderer.java
@@ -8,9 +8,9 @@
 import static org.darkar.cog_works.CogWorks.MOD_ID;
 
 public class ProspectingPickItemRenderer extends GeoItemRenderer<ProspectingPickItem> {
-
-
+	
+	
 	public ProspectingPickItemRenderer() {
-		super(new DefaultedItemGeoModel<>(new ResourceLocation(MOD_ID, "prospecting_pick")));
+		super(new DefaultedItemGeoModel<>(ResourceLocation.fromNamespaceAndPath(MOD_ID, "prospecting_pick")));
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/item/renderer/ScrewdriverItemRenderer.java b/src/main/java/org/darkar/cog_works/item/renderer/ScrewdriverItemRenderer.java
index 954c19c..7765efc 100644
--- a/src/main/java/org/darkar/cog_works/item/renderer/ScrewdriverItemRenderer.java
+++ b/src/main/java/org/darkar/cog_works/item/renderer/ScrewdriverItemRenderer.java
@@ -10,6 +10,6 @@
 public class ScrewdriverItemRenderer extends GeoItemRenderer<ScrewdriverItem> {
 	
 	public ScrewdriverItemRenderer() {
-		super(new DefaultedItemGeoModel<>(new ResourceLocation(MOD_ID, "screwdriver")));
+		super(new DefaultedItemGeoModel<>(ResourceLocation.fromNamespaceAndPath(MOD_ID, "screwdriver")));
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/level/chunk/attachment/ChunkSampleSiteMap.java b/src/main/java/org/darkar/cog_works/level/chunk/attachment/ChunkSampleSiteMap.java
index 57ef750..53186a6 100644
--- a/src/main/java/org/darkar/cog_works/level/chunk/attachment/ChunkSampleSiteMap.java
+++ b/src/main/java/org/darkar/cog_works/level/chunk/attachment/ChunkSampleSiteMap.java
@@ -11,31 +11,36 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 
-public record ChunkSampleSiteMap(BlockPos surfacePos, BlockPos deepPos, BlockState surfaceState, BlockState deepState
-	, Direction surfaceFace, Direction deepFace) {
-
-	public static final ChunkSampleSiteMap DEFAULT =
-		new ChunkSampleSiteMap(BlockPos.ZERO, BlockPos.ZERO, Blocks.AIR.defaultBlockState(),
-		                       Blocks.AIR.defaultBlockState(), Direction.NORTH, Direction.NORTH);
-
-	public static final Codec<ChunkSampleSiteMap> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-		BlockPos.CODEC.fieldOf("surfacePos").forGetter(ChunkSampleSiteMap::surfacePos),
-		BlockPos.CODEC.fieldOf("deepPos").forGetter(ChunkSampleSiteMap::deepPos),
-		BlockState.CODEC.fieldOf("surfaceState").forGetter(ChunkSampleSiteMap::surfaceState),
-		BlockState.CODEC.fieldOf("deepState").forGetter(ChunkSampleSiteMap::deepState),
-		Direction.CODEC.fieldOf("surfaceFace").forGetter(ChunkSampleSiteMap::surfaceFace),
-		Direction.CODEC.fieldOf("deepFace").forGetter(ChunkSampleSiteMap::deepFace)
-		).apply(instance, ChunkSampleSiteMap::new)
-	);
+public record ChunkSampleSiteMap(BlockPos surfacePos, BlockPos deepPos, BlockState surfaceState, BlockState deepState,
+                                 Direction surfaceFace, Direction deepFace)
+{
+	
+	public static final ChunkSampleSiteMap DEFAULT = new ChunkSampleSiteMap(BlockPos.ZERO, BlockPos.ZERO,
+	                                                                        Blocks.AIR.defaultBlockState(),
+	                                                                        Blocks.AIR.defaultBlockState(),
+	                                                                        Direction.NORTH, Direction.NORTH);
+	
+	public static final Codec<ChunkSampleSiteMap> CODEC = RecordCodecBuilder.create(instance -> instance
+		.group(BlockPos.CODEC
+			       .fieldOf("surfacePos")
+			       .forGetter(ChunkSampleSiteMap::surfacePos), BlockPos.CODEC
+			       .fieldOf("deepPos")
+			       .forGetter(ChunkSampleSiteMap::deepPos), BlockState.CODEC
+			       .fieldOf("surfaceState")
+			       .forGetter(ChunkSampleSiteMap::surfaceState), BlockState.CODEC
+			       .fieldOf("deepState")
+			       .forGetter(ChunkSampleSiteMap::deepState), Direction.CODEC
+			       .fieldOf("surfaceFace")
+			       .forGetter(ChunkSampleSiteMap::surfaceFace), Direction.CODEC
+			       .fieldOf("deepFace")
+			       .forGetter(ChunkSampleSiteMap::deepFace))
+		.apply(instance, ChunkSampleSiteMap::new));
 	
 	@SuppressWarnings("deprecation")
 	public static final StreamCodec<ByteBuf, ChunkSampleSiteMap> STREAM_CODEC = StreamCodec.composite(
-		BlockPos.STREAM_CODEC, ChunkSampleSiteMap::surfacePos,
-		BlockPos.STREAM_CODEC, ChunkSampleSiteMap::deepPos,
+		BlockPos.STREAM_CODEC, ChunkSampleSiteMap::surfacePos, BlockPos.STREAM_CODEC, ChunkSampleSiteMap::deepPos,
 		ByteBufCodecs.idMapper(Block.BLOCK_STATE_REGISTRY), ChunkSampleSiteMap::surfaceState,
-		ByteBufCodecs.idMapper(Block.BLOCK_STATE_REGISTRY), ChunkSampleSiteMap::deepState,
-		Direction.STREAM_CODEC, ChunkSampleSiteMap::surfaceFace,
-		Direction.STREAM_CODEC, ChunkSampleSiteMap::deepFace,
-		ChunkSampleSiteMap::new
-	                                                                                                 );
+		ByteBufCodecs.idMapper(Block.BLOCK_STATE_REGISTRY), ChunkSampleSiteMap::deepState, Direction.STREAM_CODEC,
+		ChunkSampleSiteMap::surfaceFace, Direction.STREAM_CODEC, ChunkSampleSiteMap::deepFace,
+		ChunkSampleSiteMap::new);
 }
diff --git a/src/main/java/org/darkar/cog_works/level/renderer/SampleSiteRenderBehaviour.java b/src/main/java/org/darkar/cog_works/level/renderer/SampleSiteRenderBehaviour.java
index bd62c61..1869501 100644
--- a/src/main/java/org/darkar/cog_works/level/renderer/SampleSiteRenderBehaviour.java
+++ b/src/main/java/org/darkar/cog_works/level/renderer/SampleSiteRenderBehaviour.java
@@ -36,8 +36,9 @@
 
 public class SampleSiteRenderBehaviour {
 	
-	private static final ResourceLocation SAMPLE_SITE_TEXTURE_KEY = new ResourceLocation(MOD_ID,
-	                                                                                     "block/sample_stone_site");
+	private static final ResourceLocation SAMPLE_SITE_TEXTURE_KEY = ResourceLocation.fromNamespaceAndPath(MOD_ID,
+	                                                                                                      "block" +
+	                                                                                                      "/sample_stone_site");
 	
 	public static void render(Frustum frustum, PoseStack poseStack, Camera cam) {
 		Minecraft minecraft = Minecraft.getInstance();
@@ -51,17 +52,21 @@ public static void render(Frustum frustum, PoseStack poseStack, Camera cam) {
 		MultiBufferSource.BufferSource source = buffers.bufferSource();
 		Vec3 camPos = cam.getPosition();
 		RenderType bufferType = NeoForgeRenderTypes.TRANSLUCENT_ON_PARTICLES_TARGET.get();
-		Map<ChunkPos, ChunkSampleSiteMap> mapsToRender = World.getNearbyChunks(chunk, level, 4).filter(
-			nearbyChunk -> nearbyChunk.hasAttachments() && nearbyChunk.hasData(CHUNK_SAMPLE_SITE_MAP) &&
-			               Data.AttachmentUtils.ChunkSampleSiteMapUtil.isDirty(
-				               nearbyChunk.getData(CHUNK_SAMPLE_SITE_MAP))).collect(
-			Collectors.toMap(ChunkAccess::getPos, mapChunk -> mapChunk.getData(CHUNK_SAMPLE_SITE_MAP)));
+		Map<ChunkPos, ChunkSampleSiteMap> mapsToRender = World
+			.getNearbyChunks(chunk, level, 4)
+			.filter(nearbyChunk -> nearbyChunk.hasAttachments() && nearbyChunk.hasData(CHUNK_SAMPLE_SITE_MAP) &&
+			                       Data.AttachmentUtils.ChunkSampleSiteMapUtil.isDirty(
+				                       nearbyChunk.getData(CHUNK_SAMPLE_SITE_MAP)))
+			.collect(Collectors.toMap(ChunkAccess::getPos, mapChunk -> mapChunk.getData(CHUNK_SAMPLE_SITE_MAP)));
 		
 		for (ChunkSampleSiteMap chunkSampleSiteMap : mapsToRender.values()) {
 			boolean isSurfaceVisible = frustum.isVisible(new AABB(chunkSampleSiteMap.surfacePos())) &&
-			                           !chunkSampleSiteMap.surfacePos().equals(BlockPos.ZERO);
-			boolean isDeepVisible = frustum.isVisible(new AABB(chunkSampleSiteMap.deepPos())) &&
-			                        !chunkSampleSiteMap.deepPos().equals(BlockPos.ZERO);
+			                           !chunkSampleSiteMap
+				                           .surfacePos()
+				                           .equals(BlockPos.ZERO);
+			boolean isDeepVisible = frustum.isVisible(new AABB(chunkSampleSiteMap.deepPos())) && !chunkSampleSiteMap
+				.deepPos()
+				.equals(BlockPos.ZERO);
 			
 			if (!isSurfaceVisible && !isDeepVisible) {
 				return;
@@ -69,7 +74,9 @@ public static void render(Frustum frustum, PoseStack poseStack, Camera cam) {
 			
 			BlockPos pos = isSurfaceVisible ? chunkSampleSiteMap.surfacePos() : chunkSampleSiteMap.deepPos();
 			Direction face = isSurfaceVisible ? chunkSampleSiteMap.surfaceFace() : chunkSampleSiteMap.deepFace();
-			Vec3 offset = Vec3.atLowerCornerOf(pos).subtract(camPos);
+			Vec3 offset = Vec3
+				.atLowerCornerOf(pos)
+				.subtract(camPos);
 			
 			poseStack.pushPose();
 			poseStack.translate(offset.x, offset.y, offset.z);
@@ -81,26 +88,41 @@ public static void render(Frustum frustum, PoseStack poseStack, Camera cam) {
 			}
 			poseStack.translate(-.5F, -.5F, -.5F);
 			VertexConsumer textureConsumer = source.getBuffer(bufferType);
-			TextureAtlasSprite texture = minecraft.getTextureAtlas(InventoryMenu.BLOCK_ATLAS).apply(
-				SAMPLE_SITE_TEXTURE_KEY);
+			TextureAtlasSprite texture = minecraft
+				.getTextureAtlas(InventoryMenu.BLOCK_ATLAS)
+				.apply(SAMPLE_SITE_TEXTURE_KEY);
 			
-			Matrix4f quadMatrix = poseStack.last().pose();
-			textureConsumer.vertex(quadMatrix, 0, 1, -0.01F).color(255, 255, 255, 255).uv(texture.getU0(),
-			                                                                              texture.getV0())
-			               .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(
-				               poseStack.last(), 0, 0, -1).endVertex();
-			textureConsumer.vertex(quadMatrix, 1, 1, -0.01F).color(255, 255, 255, 255).uv(texture.getU0(),
-			                                                                              texture.getV1())
-			               .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(
-				               poseStack.last(), 0, 0, -1).endVertex();
-			textureConsumer.vertex(quadMatrix, 1, 0, -0.01F).color(255, 255, 255, 255).uv(texture.getU1(),
-			                                                                              texture.getV1())
-			               .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(
-				               poseStack.last(), 0, 0, -1).endVertex();
-			textureConsumer.vertex(quadMatrix, 0, 0, -0.01F).color(255, 255, 255, 255).uv(texture.getU1(),
-			                                                                              texture.getV0())
-			               .overlayCoords(OverlayTexture.NO_OVERLAY).uv2(LightTexture.FULL_BRIGHT).normal(
-				               poseStack.last(), 0, 0, -1).endVertex();
+			Matrix4f quadMatrix = poseStack
+				.last()
+				.pose();
+			textureConsumer
+				.addVertex(quadMatrix, 0, 1, -0.01F)
+				.setColor(255, 255, 255, 255)
+				.setUv(texture.getU0(), texture.getV0())
+				.setOverlay(OverlayTexture.NO_OVERLAY)
+				.setLight(LightTexture.FULL_BRIGHT)
+				.setNormal(poseStack.last(), 0, 0, -1);
+			textureConsumer
+				.addVertex(quadMatrix, 1, 1, -0.01F)
+				.setColor(255, 255, 255, 255)
+				.setUv(texture.getU0(), texture.getV1())
+				.setOverlay(OverlayTexture.NO_OVERLAY)
+				.setLight(LightTexture.FULL_BRIGHT)
+				.setNormal(poseStack.last(), 0, 0, -1);
+			textureConsumer
+				.addVertex(quadMatrix, 1, 0, -0.01F)
+				.setColor(255, 255, 255, 255)
+				.setUv(texture.getU1(), texture.getV1())
+				.setOverlay(OverlayTexture.NO_OVERLAY)
+				.setLight(LightTexture.FULL_BRIGHT)
+				.setNormal(poseStack.last(), 0, 0, -1);
+			textureConsumer
+				.addVertex(quadMatrix, 0, 0, -0.01F)
+				.setColor(255, 255, 255, 255)
+				.setUv(texture.getU1(), texture.getV0())
+				.setOverlay(OverlayTexture.NO_OVERLAY)
+				.setLight(LightTexture.FULL_BRIGHT)
+				.setNormal(poseStack.last(), 0, 0, -1);
 			source.endBatch(bufferType);
 			poseStack.popPose();
 		}
diff --git a/src/main/java/org/darkar/cog_works/net/NetworkHandler.java b/src/main/java/org/darkar/cog_works/net/NetworkHandler.java
index 4c39a8d..ae141ea 100644
--- a/src/main/java/org/darkar/cog_works/net/NetworkHandler.java
+++ b/src/main/java/org/darkar/cog_works/net/NetworkHandler.java
@@ -14,11 +14,9 @@ public class NetworkHandler {
 	@SubscribeEvent
 	public static void onPayloadHandlersRegister(final RegisterPayloadHandlersEvent event) {
 		final PayloadRegistrar registrar = event.registrar(PROTOCOL_VERSION);
-		registrar.executesOn(HandlerThread.NETWORK)
-			.playToClient(
-				ClientSampleSiteMapUpdatePayload.TYPE,
-			              ClientSampleSiteMapUpdatePayload.STREAM_CODEC,
-			              ClientSampleSiteMapUpdatePayload::handle
-			             );
+		registrar
+			.executesOn(HandlerThread.NETWORK)
+			.playToClient(ClientSampleSiteMapUpdatePayload.TYPE, ClientSampleSiteMapUpdatePayload.STREAM_CODEC,
+			              ClientSampleSiteMapUpdatePayload::handle);
 	}
 }
diff --git a/src/main/java/org/darkar/cog_works/net/payload/client/ClientSampleSiteMapUpdatePayload.java b/src/main/java/org/darkar/cog_works/net/payload/client/ClientSampleSiteMapUpdatePayload.java
index f7c61d9..3e540c8 100644
--- a/src/main/java/org/darkar/cog_works/net/payload/client/ClientSampleSiteMapUpdatePayload.java
+++ b/src/main/java/org/darkar/cog_works/net/payload/client/ClientSampleSiteMapUpdatePayload.java
@@ -17,17 +17,17 @@
 import static org.darkar.cog_works.CogWorks.MOD_ID;
 import static org.darkar.cog_works.Registry.DataAttachments.CHUNK_SAMPLE_SITE_MAP;
 
-public record ClientSampleSiteMapUpdatePayload(ChunkPos targetChunk, ChunkSampleSiteMap sampleSiteMap) implements CustomPacketPayload
+public record ClientSampleSiteMapUpdatePayload(ChunkPos targetChunk,
+                                               ChunkSampleSiteMap sampleSiteMap) implements CustomPacketPayload
 {
 	
 	public static final CustomPacketPayload.Type<ClientSampleSiteMapUpdatePayload> TYPE =
-		new CustomPacketPayload.Type<>(new ResourceLocation(MOD_ID, "update_chunk_sample_site_map"));
+		new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(MOD_ID, "update_chunk_sample_site_map"));
 	
-	public static final StreamCodec<FriendlyByteBuf, ClientSampleSiteMapUpdatePayload> STREAM_CODEC = StreamCodec.composite(
-		NeoForgeStreamCodecs.CHUNK_POS, ClientSampleSiteMapUpdatePayload::targetChunk,
-		ChunkSampleSiteMap.STREAM_CODEC, ClientSampleSiteMapUpdatePayload::sampleSiteMap,
-		ClientSampleSiteMapUpdatePayload::new
-	                                                                                                                       );
+	public static final StreamCodec<FriendlyByteBuf, ClientSampleSiteMapUpdatePayload> STREAM_CODEC =
+		StreamCodec.composite(NeoForgeStreamCodecs.CHUNK_POS, ClientSampleSiteMapUpdatePayload::targetChunk,
+		                      ChunkSampleSiteMap.STREAM_CODEC, ClientSampleSiteMapUpdatePayload::sampleSiteMap,
+		                      ClientSampleSiteMapUpdatePayload::new);
 	
 	
 	public static void handle(final ClientSampleSiteMapUpdatePayload data, final IPayloadContext ctx) {
@@ -39,8 +39,7 @@ public static void handle(final ClientSampleSiteMapUpdatePayload data, final IPa
 				ChunkAccess chunk = level.getChunk(data.targetChunk().x, data.targetChunk().z);
 				ChunkSampleSiteMap sampleSiteMap = data.sampleSiteMap();
 				
-				LOGGER.info("Client received Sample Site Map Update Payload: {}", data);
-				chunk.setData(CHUNK_SAMPLE_SITE_MAP,sampleSiteMap);
+				chunk.setData(CHUNK_SAMPLE_SITE_MAP, sampleSiteMap);
 				
 			}
 		});
diff --git a/src/main/java/org/darkar/cog_works/utils/Data.java b/src/main/java/org/darkar/cog_works/utils/Data.java
index 3a5082e..69c4192 100644
--- a/src/main/java/org/darkar/cog_works/utils/Data.java
+++ b/src/main/java/org/darkar/cog_works/utils/Data.java
@@ -14,6 +14,7 @@ public static class ChunkSampleSiteMapUtil {
 			 * Resets the surface position and state of the given {@link ChunkSampleSiteMap} to the default values.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to reset
+			 *
 			 * @return a new {@link ChunkSampleSiteMap} with the surface position and state reset to the default values
 			 */
 			public static ChunkSampleSiteMap resetDefaultSurface(ChunkSampleSiteMap chunkSampleSiteMap) {
@@ -27,6 +28,7 @@ public static ChunkSampleSiteMap resetDefaultSurface(ChunkSampleSiteMap chunkSam
 			 * Resets the deep position and state of the given {@link ChunkSampleSiteMap} to the default values.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to reset
+			 *
 			 * @return a new {@link ChunkSampleSiteMap} with the deep position and state reset to the default values
 			 */
 			public static ChunkSampleSiteMap resetDefaultDeep(ChunkSampleSiteMap chunkSampleSiteMap) {
@@ -41,11 +43,14 @@ public static ChunkSampleSiteMap resetDefaultDeep(ChunkSampleSiteMap chunkSample
 			 * {@link ChunkSampleSiteMap}. But only checks the position, not the state.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to check
-			 * @param blockPos the {@link BlockPos} to check
+			 * @param blockPos           the {@link BlockPos} to check
+			 *
 			 * @return {@code true} if the given {@link BlockPos} matches the surface position of the given
 			 */
 			public static boolean isSurface(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blockPos) {
-				return chunkSampleSiteMap.surfacePos().equals(blockPos);
+				return chunkSampleSiteMap
+					.surfacePos()
+					.equals(blockPos);
 			}
 			
 			/**
@@ -53,43 +58,60 @@ public static boolean isSurface(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos
 			 * {@link ChunkSampleSiteMap}. Checks both the position and the state.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to check
-			 * @param blockPos the {@link BlockPos} to check
-			 * @param level the {@link Level} to access the block state
-			 * @return {@code true} if the given {@link BlockPos} matches the surface position of the given {@link ChunkSampleSiteMap}
-			 * and the block state at the given {@link BlockPos} matches the surface state of the given {@link ChunkSampleSiteMap}
+			 * @param blockPos           the {@link BlockPos} to check
+			 * @param level              the {@link Level} to access the block state
+			 *
+			 * @return {@code true} if the given {@link BlockPos} matches the surface position of the given
+			 * {@link ChunkSampleSiteMap}
+			 * and the block state at the given {@link BlockPos} matches the surface state of the given
+			 * {@link ChunkSampleSiteMap}
 			 */
-			public static boolean isSurface(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blockPos,
-			                                          Level level)
+			public static boolean isSurface(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blockPos, Level level)
 			{
-				return chunkSampleSiteMap.surfacePos().equals(blockPos) && chunkSampleSiteMap.surfaceState().equals(
-					level.getBlockState(blockPos));
+				return chunkSampleSiteMap
+					       .surfacePos()
+					       .equals(blockPos) && chunkSampleSiteMap
+					       .surfaceState()
+					       .equals(level.getBlockState(blockPos));
 			}
 			
 			/**
-			 * Determines if the given {@link BlockPos} matches the deep position of the given {@link ChunkSampleSiteMap}.
+			 * Determines if the given {@link BlockPos} matches the deep position of the given
+			 * {@link ChunkSampleSiteMap}.
 			 * But only checks the position, not the state.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to check
-			 * @param blockPos the {@link BlockPos} to check
-			 * @return {@code true} if the given {@link BlockPos} matches the deep position of the given {@link ChunkSampleSiteMap}
+			 * @param blockPos           the {@link BlockPos} to check
+			 *
+			 * @return {@code true} if the given {@link BlockPos} matches the deep position of the given
+			 * {@link ChunkSampleSiteMap}
 			 */
 			public static boolean isDeep(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blockPos) {
-				return chunkSampleSiteMap.deepPos().equals(blockPos);
+				return chunkSampleSiteMap
+					.deepPos()
+					.equals(blockPos);
 			}
 			
 			/**
-			 * Determines if the given {@link BlockPos} matches the deep position of the given {@link ChunkSampleSiteMap}.
+			 * Determines if the given {@link BlockPos} matches the deep position of the given
+			 * {@link ChunkSampleSiteMap}.
 			 * Checks both the position and the state.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to check
-			 * @param blockPos the {@link BlockPos} to check
-			 * @param level the {@link Level} to access the block state
-			 * @return {@code true} if the given {@link BlockPos} matches the deep position of the given {@link ChunkSampleSiteMap}
-			 * and the block state at the given {@link BlockPos} matches the deep state of the given {@link ChunkSampleSiteMap}
+			 * @param blockPos           the {@link BlockPos} to check
+			 * @param level              the {@link Level} to access the block state
+			 *
+			 * @return {@code true} if the given {@link BlockPos} matches the deep position of the given
+			 * {@link ChunkSampleSiteMap}
+			 * and the block state at the given {@link BlockPos} matches the deep state of the given
+			 * {@link ChunkSampleSiteMap}
 			 */
 			public static boolean isDeep(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blockPos, Level level) {
-				return chunkSampleSiteMap.deepPos().equals(blockPos) && chunkSampleSiteMap.deepState().equals(
-					level.getBlockState(blockPos));
+				return chunkSampleSiteMap
+					       .deepPos()
+					       .equals(blockPos) && chunkSampleSiteMap
+					       .deepState()
+					       .equals(level.getBlockState(blockPos));
 			}
 			
 			/**
@@ -97,8 +119,10 @@ public static boolean isDeep(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blo
 			 * {@link ChunkSampleSiteMap}. But only checks the position, not the state.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to check
-			 * @param blockPos the {@link BlockPos} to check
-			 * @return {@code true} if the given {@link BlockPos} matches either the surface or deep position of the given
+			 * @param blockPos           the {@link BlockPos} to check
+			 *
+			 * @return {@code true} if the given {@link BlockPos} matches either the surface or deep position of the
+			 * given
 			 */
 			public static boolean isSurfaceOrDeep(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blockPos) {
 				return isSurface(chunkSampleSiteMap, blockPos) || isDeep(chunkSampleSiteMap, blockPos);
@@ -109,14 +133,17 @@ public static boolean isSurfaceOrDeep(ChunkSampleSiteMap chunkSampleSiteMap, Blo
 			 * {@link ChunkSampleSiteMap}. Checks both the position and the state.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to check
-			 * @param blockPos the {@link BlockPos} to check
-			 * @param level the {@link Level} to access the block state
-			 * @return {@code true} if the given {@link BlockPos} matches either the surface or deep position of the given
-			 * {@link ChunkSampleSiteMap} and the block state at the given {@link BlockPos} matches either the surface or deep state
+			 * @param blockPos           the {@link BlockPos} to check
+			 * @param level              the {@link Level} to access the block state
+			 *
+			 * @return {@code true} if the given {@link BlockPos} matches either the surface or deep position of the
+			 * given
+			 * {@link ChunkSampleSiteMap} and the block state at the given {@link BlockPos} matches either the surface
+			 * or deep state
 			 * of the given {@link ChunkSampleSiteMap}
 			 */
 			public static boolean isSurfaceOrDeep(ChunkSampleSiteMap chunkSampleSiteMap, BlockPos blockPos,
-			                                               Level level)
+			                                      Level level)
 			{
 				return isSurface(chunkSampleSiteMap, blockPos, level) || isDeep(chunkSampleSiteMap, blockPos, level);
 			}
@@ -125,6 +152,7 @@ public static boolean isSurfaceOrDeep(ChunkSampleSiteMap chunkSampleSiteMap, Blo
 			 * Determines if the given {@link ChunkSampleSiteMap} is different from its default in any member.
 			 *
 			 * @param chunkSampleSiteMap the {@link ChunkSampleSiteMap} to check
+			 *
 			 * @return {@code true} if the given {@link ChunkSampleSiteMap} is dirty
 			 */
 			public static boolean isDirty(ChunkSampleSiteMap chunkSampleSiteMap) {
diff --git a/src/main/java/org/darkar/cog_works/utils/World.java b/src/main/java/org/darkar/cog_works/utils/World.java
index 64c5cce..d54bf0b 100644
--- a/src/main/java/org/darkar/cog_works/utils/World.java
+++ b/src/main/java/org/darkar/cog_works/utils/World.java
@@ -13,21 +13,23 @@ public class World {
 	 *
 	 * @param chunk the {@link ChunkAccess} that is the center to get nearby chunks from
 	 * @param level the {@link Level} to get the chunks from
+	 *
 	 * @return a list of nearby chunks around the given {@link ChunkAccess}
 	 */
 	public static Stream<ChunkAccess> getNearbyChunks(ChunkAccess chunk, Level level) {
-		return getNearbyChunks(chunk, level,2);
+		return getNearbyChunks(chunk, level, 2);
 	}
 	
 	/**
 	 * Gets a list of nearby chunks around the given {@link ChunkAccess} within the given radius.
 	 *
-	 * @param chunk the {@link ChunkAccess} that is the center to get nearby chunks from
-	 * @param level the {@link Level} to get the chunks from
+	 * @param chunk  the {@link ChunkAccess} that is the center to get nearby chunks from
+	 * @param level  the {@link Level} to get the chunks from
 	 * @param radius the radius to search for nearby chunks
+	 *
 	 * @return a list of nearby chunks around the given {@link ChunkAccess}
 	 */
-	public static  Stream<ChunkAccess> getNearbyChunks(ChunkAccess chunk, Level level ,int radius) {
+	public static Stream<ChunkAccess> getNearbyChunks(ChunkAccess chunk, Level level, int radius) {
 		ChunkPos chunkPos = chunk.getPos();
 		Stream<ChunkPos> chunkPosStream = ChunkPos.rangeClosed(chunkPos, radius);
 		return chunkPosStream.map(pos -> level.getChunk(pos.x, pos.z));
diff --git a/src/main/java/org/darkar/cog_works/utils/enums/SampleSiteRegion.java b/src/main/java/org/darkar/cog_works/utils/enums/SampleSiteRegion.java
index a19b19c..7aefc1c 100644
--- a/src/main/java/org/darkar/cog_works/utils/enums/SampleSiteRegion.java
+++ b/src/main/java/org/darkar/cog_works/utils/enums/SampleSiteRegion.java
@@ -15,16 +15,20 @@ public enum SampleSiteRegion {
 	
 	public static final Codec<SampleSiteRegion> CODEC = Codec.STRING.comapFlatMap((regionName) -> {
 		Optional<SampleSiteRegion> sampleSiteRegion = SampleSiteRegion.getRegion(regionName);
-		return sampleSiteRegion.<DataResult<? extends SampleSiteRegion>>map(DataResult::success).orElseGet(
-			() -> DataResult.error(() -> String.format("Invalid Sample Site Region name provided %s", regionName)));
+		return sampleSiteRegion
+			.<DataResult<? extends SampleSiteRegion>>map(DataResult::success)
+			.orElseGet(
+				() -> DataResult.error(() -> String.format("Invalid Sample Site Region name provided %s",
+				                                           regionName)));
 	}, SampleSiteRegion::name);
 	
-	public static final StreamCodec<ByteBuf, SampleSiteRegion> STREAM_CODEC =
-		ByteBufCodecs.STRING_UTF8.map((regionName) -> {
+	public static final StreamCodec<ByteBuf, SampleSiteRegion> STREAM_CODEC = ByteBufCodecs.STRING_UTF8.map(
+		(regionName) -> {
 			Optional<SampleSiteRegion> sampleSiteRegion = SampleSiteRegion.getRegion(regionName);
-			return sampleSiteRegion.orElseThrow(() -> new IllegalArgumentException("Invalid Sample Site Region name provided " + regionName));
+			return sampleSiteRegion.orElseThrow(
+				() -> new IllegalArgumentException("Invalid Sample Site Region name provided " + regionName));
 		}, SampleSiteRegion::name);
-	 
+	
 	
 	/**
 	 * Represents the maximum Y (Top)
@@ -67,7 +71,10 @@ public static Optional<SampleSiteRegion> getRegion(int yPos) {
 	 */
 	public static Optional<SampleSiteRegion> getRegion(String regionName) {
 		for (SampleSiteRegion region : SampleSiteRegion.values()) {
-			if (region.name().equalsIgnoreCase(regionName)) {
+			if (region
+				.name()
+				.equalsIgnoreCase(regionName))
+			{
 				return Optional.of(region);
 			}
 		}