Added INGOT_FUSION_TOLL_ENHANCER block

.github/workflows/codecov.yml

@@ -8,15 +8,15 @@ jobs:
     name: "Codecov"
     steps:
       - uses: actions/checkout@v4
-      - name: Setup java
+      - name: Setup java 17
         uses: actions/setup-java@v3
         with:
           distribution: "temurin"
           java-version: "17"
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build project
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.9.0
         with:
           arguments: test jacocoTestReport
       - name: Upload coverage reports to Codecov

.github/workflows/gradle.yml

@@ -5,25 +5,25 @@ name: Java CI
 
 on:
   push:
-    branches: [ main, 1.20.1 ]
+    branches: [ main ]
   pull_request:
-    branches: [ main, 1.20.1 ]
+    branches: [ main ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v2.9.0
         with:
           arguments: build
       - uses: actions/upload-artifact@v3

.github/workflows/page.yml

@@ -0,0 +1,42 @@
+name: Generate dokka github pages
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Generate documentation directory
+        uses: gradle/gradle-build-action@v2.9.0
+        with:
+          arguments: dokkaHtml
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v2
+        with:
+          path: ./build/dokka/html
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@main

.gitignore

@@ -4,6 +4,7 @@
 ### ForgeGradle ###
 # Minecraft client/server files
 run/
+run-data/
 
 ### Intellij+all ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.20.1-1.0.6] - 2023-10-13
+
+### Added Ingot Fusion Enchanter (been in the works for a month with more than two rewrites) :
+### This allows you to upgrade certain items. Currently only works with the MAGMA_STRIKE_PICKAXE. More to come in the future.
+### Added imperium sword, pickaxe, axe, ingot and ore. More to come in the future.
+### Added saphire tool recipes to the tool crafting table.
+### Fixed issue with JEI for custom crafting tables where some recipes were not showing.
+### Added support for enchanted items to be crafted in the custom crafting tables.
+### Fixed some other issues I came across while testing.
+
 ## [1.20.1-1.0.5] - 2023-09-26
 
 ### Added JEI integration for custom crafting tables.
@@ -13,8 +23,8 @@ All notable changes to this project will be documented in this file.
 
 ## [1.20.1-1.0.3] - 2023-9-23
 
-### Add advancments for root and ruby. More to come in future.
-### Switched some recipies to use tags instead of specific items. This will allow for more flexability in future.
+### Add advancements for root and ruby. More to come in the future.
+### Switched some recipes to use tags instead of specific items. This will allow for more flexibility in the future.
 
 ## [1.20.1-1.0.2]  - 2023-9-3
 
@@ -41,16 +51,16 @@ All notable changes to this project will be documented in this file.
 ### Added enderite ore, block, ingot, tools and armour. Thx to redrosewarrior1 for some of the textures.
 ### Rainbow armour now has a texture. Thx to redrosewarrior1 for the textures.
 ### Known issue with ore generation. Will be fixed in future.
-### Fixed issue where nothing was craftable in tool crafting table.
-### Fixed issue where the crafting book gave the wrong patern for recipes in both armour and tool crafting tables.
+### Fixed issue where nothing was craft-able in tool crafting table.
+### Fixed issue where the crafting book gave the wrong pattern for recipes in both armor and tool crafting tables.
 ### Fixed issue were stats for tools such as attack damage where incorrect.
 
 ## [1.19.4-1.0.0.beta.6] - 2023-7-20
 
-### Added missing recipe for tool crafting table
-### Added all tool set for ruby
+### Added a missing recipe for tool crafting table
+### Added all tool sets for ruby
 ### Added aquarium trident. - Textures not added yet.
-### Added shields for all custom ores. - Textures not added yet.
+### Added shields for all custom ores. — Textures aren't added yet.
 
 ## [1.19.4-1.0.0.beta.5] - 2023-5-3
 
@@ -63,7 +73,7 @@ All notable changes to this project will be documented in this file.
 
 ## [1.19.4-1.0.0.beta.3] - 2023-4-25
 
-### Bug fixe where game crashed due to outdated patchouli version
+### Bug fixe where game crashed due to an outdated patchouli version
 ### Added new custom tool table
 
 ## [1.19.4-1.0.0.beta.2] - 2023-4-17
@@ -120,5 +130,5 @@ All notable changes to this project will be documented in this file.
 ### I fixed a lot of bugs.
 ### Create menu should now appear with properly formatted names for each item/block.
 ### Ignore the warning when starting. The issue will be fixed in due course. 
-### I switched from Java to Kotlin. Does not affect you.
+### I switched from Java to Kotlin. It Does not affect you.
 ### Now required kotlin for forge

build.gradle.kts

@@ -1,11 +1,18 @@
 import io.gitlab.arturbosch.detekt.Detekt
+import java.net.URL
 import net.minecraftforge.gradle.userdev.UserDevExtension
+import org.jetbrains.dokka.base.DokkaBase
+import org.jetbrains.dokka.base.DokkaBaseConfiguration
+import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     repositories { mavenCentral() }
 
-    dependencies { classpath("io.github.realyusufismail:jconfig:1.0.8") }
+    dependencies {
+        classpath("org.jetbrains.dokka:dokka-base:1.9.0")
+        classpath("io.github.realyusufismail:jconfig:1.0.8")
+    }
 }
 
 plugins {
@@ -16,6 +23,7 @@ plugins {
     id("org.parchmentmc.librarian.forgegradle") version "1.+"
     id("io.gitlab.arturbosch.detekt") version "1.23.0"
     id("net.darkhax.curseforgegradle") version "1.1.16"
+    id("org.jetbrains.dokka") version "1.9.0"
     jacoco // code coverage reports
 }
 
@@ -129,6 +137,8 @@ configure<UserDevExtension> {
     }
 }
 
+configurations { compileOnly { extendsFrom(configurations.annotationProcessor.get()) } }
+
 sourceSets.main { resources.srcDir("src/generated/resources") }
 
 repositories {
@@ -155,6 +165,10 @@ dependencies {
     compileOnly(fg.deobf("mezz.jei:jei-${mcVersion}-common-api:" + properties["jeiVersion"]))
     compileOnly(fg.deobf("mezz.jei:jei-${mcVersion}-forge-api:" + properties["jeiVersion"]))
     runtimeOnly(fg.deobf("mezz.jei:jei-${mcVersion}-forge:" + properties["jeiVersion"]))
+
+    // lombok
+    compileOnly("org.projectlombok:lombok:" + properties["lombokVersion"])
+    annotationProcessor("org.projectlombok:lombok:" + properties["lombokVersion"])
 }
 
 tasks.test {
@@ -198,6 +212,33 @@ spotless {
         indentWithSpaces()
         endWithNewline()
     }
+
+    java {
+        target("**/*.java")
+        googleJavaFormat()
+        trimTrailingWhitespace()
+        indentWithSpaces()
+        endWithNewline()
+        licenseHeader(
+            """/*
+ * Copyright 2023 RealYusufIsmail.
+ *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ *
+ * you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ """)
+    }
 }
 
 tasks.javadoc {
@@ -269,3 +310,29 @@ tasks.create("cfPublish", net.darkhax.curseforgegradle.TaskPublishCurseForge::cl
     mainFile.addModLoader("forge")
     mainFile.addGameVersion(mcVersion)
 }
+
+tasks.getByName("dokkaHtml", DokkaTask::class) {
+    dokkaSourceSets.configureEach {
+        includes.from("README.md")
+        jdkVersion.set(17)
+        sourceLink {
+            localDirectory.set(file("src/main/kotlin"))
+            remoteUrl.set(
+                URL(
+                    "https://github.com/RealYusufIsmail-Mc-Mods/Armour-and-Tools-Mod/blob/main/src/main/kotlin"))
+            remoteLineSuffix.set("#L")
+        }
+
+        sourceLink {
+            localDirectory.set(file("src/main/java"))
+            remoteUrl.set(
+                URL(
+                    "https://github.com/RealYusufIsmail-Mc-Mods/Armour-and-Tools-Mod/blob/main/src/main/java"))
+            remoteLineSuffix.set("#L")
+        }
+
+        pluginConfiguration<DokkaBase, DokkaBaseConfiguration> {
+            footerMessage = "Copyright © 2023 RealYusufIsmail MC Mods"
+        }
+    }
+}

gradle.properties

@@ -7,4 +7,5 @@ kotlinForForgeVersion = 4.4.0
 logbackVersion = 1.4.11
 junitVersion = 5.10.0
 coreVersion = 1.20.1-1.0.1
-jeiVersion = 15.2.0.27
+jeiVersion = 15.2.0.27
+lombokVersion = 1.18.30

gradle/config/detekt.yml

@@ -129,7 +129,7 @@ complexity:
     active: false
     threshold: 60
   LongParameterList:
-    active: true
+    active: false
     functionThreshold: 6
     constructorThreshold: 10
     ignoreDefaultParameters: false

src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924

@@ -1,13 +1,15 @@
-// 1.20.1	2023-09-03T09:44:53.454996	Registries
+// 1.20.1	2023-10-12T22:09:59.3276706	Registries
 8ebeb9bcc133ba172a3775d0e796bc03967d305e data/armourandtoolsmod/worldgen/configured_feature/aqumarine_ore.json
 efcff90a0c2ce2de5ad73b08e38af0880ff404de data/armourandtoolsmod/worldgen/configured_feature/enderite_ore.json
 b77f5a337f5557cc75c6aa6e358f59b658ba914c data/armourandtoolsmod/worldgen/configured_feature/graphite_ore.json
+3586104847bae073d8ffda6725cfe9f65fd3db37 data/armourandtoolsmod/worldgen/configured_feature/imperium_ore.json
 b6141dbad16c493a2dd3da977a099762593c0ce1 data/armourandtoolsmod/worldgen/configured_feature/rainbow_ore.json
 3057438b0a0e49c8fa64f17eca031307d1247594 data/armourandtoolsmod/worldgen/configured_feature/ruby_ore.json
 ae5ee97a8e0db56c8b686c63d73efad162974df7 data/armourandtoolsmod/worldgen/configured_feature/sapphire_ore.json
 f27642c578ca288c102d5a06421fcd879102fd7a data/armourandtoolsmod/worldgen/placed_feature/aqumarine_ore.json
 a0c79f9bf1ba7248cab71480bb71041682400cdd data/armourandtoolsmod/worldgen/placed_feature/enderite_ore.json
 65608a650f79607aeb96f0ad3ed9a099f59aec67 data/armourandtoolsmod/worldgen/placed_feature/graphite_ore.json
+c8eccb16b2db153e5902b8c8ab07a2a7f51a2f36 data/armourandtoolsmod/worldgen/placed_feature/imperium_ore.json
 c784f4c858f7b80fcc27ca88c8f80774bfa35b23 data/armourandtoolsmod/worldgen/placed_feature/rainbow_ore.json
 7bb425cc1128f1c7cce61f9ef23b30e7bf3b3331 data/armourandtoolsmod/worldgen/placed_feature/ruby_ore.json
 ed58618a3af3d63c835c2a5dccff501b8272f323 data/armourandtoolsmod/worldgen/placed_feature/sapphire_ore.json

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1,17 +1,20 @@
-// 1.20.1	2023-08-28T05:16:02.6192725	Loot Tables
+// 1.20.1	2023-10-12T22:09:59.3226175	Loot Tables
 2898515efda3fb01ac7eb6337875f6310869a683 data/armourandtoolsmod/loot_tables/blocks/aqumarine_block.json
 1efb52b906488da11f7948ed6a21285c1ae085c5 data/armourandtoolsmod/loot_tables/blocks/aqumarine_ore.json
 0f854404a05c040106f826bf3e6eb1debb2b8513 data/armourandtoolsmod/loot_tables/blocks/custom_armour_crafting_table.json
 56189365fbfbeedbc9086e95af54637dc1288e25 data/armourandtoolsmod/loot_tables/blocks/custom_tool_crafting_table.json
 037852d2164bc89fdf7eec7ca820d976bfb8cf00 data/armourandtoolsmod/loot_tables/blocks/deepslate_aqumarine_ore.json
 052b565467fcb498276abcd82329fa8e9f3dac0c data/armourandtoolsmod/loot_tables/blocks/deepslate_graphite_ore.json
+c80a43cdf06bb47f0ea5ac5792cff47d6dd1365a data/armourandtoolsmod/loot_tables/blocks/deepslate_imperium_ore.json
 5b1d35ef7749092a2048ab38bc74861db42d08d9 data/armourandtoolsmod/loot_tables/blocks/deepslate_rainbow_ore.json
 353b1fcc43692ef4d531d28725c0cbae9f21beed data/armourandtoolsmod/loot_tables/blocks/deepslate_ruby_ore.json
 5152d7bfc26caa8fbafd7d728a3bde94f17071f1 data/armourandtoolsmod/loot_tables/blocks/deepslate_sapphire_ore.json
 ee3c7cea455b43662bb85c65ba097a66fad15e2b data/armourandtoolsmod/loot_tables/blocks/enderite_block.json
 0a1baaef0c26d8186cfebd9b5f7e8a319d14187d data/armourandtoolsmod/loot_tables/blocks/enderite_ore.json
 baf5c9934dbe9336e2362956ea6223cd4f067fd5 data/armourandtoolsmod/loot_tables/blocks/graphite_block.json
 4e4d7f9e13f901fe3ae5ca406313f683dda24fbb data/armourandtoolsmod/loot_tables/blocks/graphite_ore.json
+17468a98a420053cfde63911493d9289cffa48f4 data/armourandtoolsmod/loot_tables/blocks/imperium_ore.json
+e71ceb5931a3484e4792e6c73a0f9ff13d769c6f data/armourandtoolsmod/loot_tables/blocks/ingot_fusion_toll_enhancer.json
 be352efe18892a6d569480eb2c34423ab7e8f199 data/armourandtoolsmod/loot_tables/blocks/rainbow_block.json
 8c9c9a72eb8e8424e527174afee3bee8f54a6c0d data/armourandtoolsmod/loot_tables/blocks/rainbow_ore.json
 1b4f1728a73c79f1834e8d896bd7af391a8782ac data/armourandtoolsmod/loot_tables/blocks/ruby_block.json

src/generated/resources/.cache/9cedfe5b9b9b8fb51ee0cbcde6ee21cf9da7c57c

@@ -1,13 +1,15 @@
-// 1.20.1	2023-08-28T05:16:02.6122709	Tags for minecraft:block mod id armourandtoolsmod
+// 1.20.1	2023-10-12T22:09:59.3123883	Tags for minecraft:block mod id armourandtoolsmod
 f4e0d28b203a60fd241885a727654636c8762650 data/forge/tags/blocks/deepslate_ores/aqumarine_ores.json
 186e50e522fb2ae91c6e315a523523796b105b56 data/forge/tags/blocks/deepslate_ores/graphite_ores.json
+08f48b19390eb9e06478f989851d261c8cb384a4 data/forge/tags/blocks/deepslate_ores/imperium_ores.json
 d66c065dfb98375b77835223afe692a26c7be84b data/forge/tags/blocks/deepslate_ores/rainbow_ores.json
 cd94fb683ebafe1cbde0ba3a30280d57b587fc34 data/forge/tags/blocks/deepslate_ores/ruby_ores.json
 6a274e766194dfaf9c967be14c4b26a4ff637a8b data/forge/tags/blocks/deepslate_ores/sapphire_ores.json
 f773a519f0e034a7e3ca24464a8b960396d4da4c data/forge/tags/blocks/needs_gold_tool.json
 1372356eb4655b6d26d8a5a16aaa3032bbb738d4 data/forge/tags/blocks/ores/aqumarine_ores.json
 fef5965e3903fc07aa6146bd17e74efd9b313fb6 data/forge/tags/blocks/ores/enderite_ores.json
 974c70b44df044135463b300ebed43eee38001b3 data/forge/tags/blocks/ores/graphite_ores.json
+e892786d477f668113418b8239abc7bb6395f33f data/forge/tags/blocks/ores/imperium_ores.json
 fa835a8b8eb217767d6139f02c46edfa27377555 data/forge/tags/blocks/ores/rainbow_ores.json
 f5b270d5c60fdfc53020be6469026c27bc742f1e data/forge/tags/blocks/ores/ruby_ores.json
 47d725a30030287aa216532b38ba1d0774dd627f data/forge/tags/blocks/ores/sapphire_ores.json
@@ -17,7 +19,7 @@ b4f0641534858a5001fc966241f11ffc58353dea data/forge/tags/blocks/storage_blocks/a
 55c124f845d639b73cb5bffcdcc94bcfd8967966 data/forge/tags/blocks/storage_blocks/rainbow.json
 bc5ebfcaf115155b63f0817517bdc3efc0934364 data/forge/tags/blocks/storage_blocks/ruby.json
 2e755598d83145bf0d52488c9d8e3c41331dccc3 data/forge/tags/blocks/storage_blocks/sapphire.json
-e02f0a033c0eb74be90322606c5f21845d302cf1 data/minecraft/tags/blocks/mineable/pickaxe.json
+a5acd6d8f782164d765c73d2438d0289b32f2bcd data/minecraft/tags/blocks/mineable/pickaxe.json
 98eed05f65788348c30e906407f790c6a4d70f32 data/minecraft/tags/blocks/needs_diamond_tool.json
-305db57c519bc4cfa07a662c8beeffec12ffac38 data/minecraft/tags/blocks/needs_iron_tool.json
+7f6f40bd05ba0003ea6e54eee50655a1d2fc1fcb data/minecraft/tags/blocks/needs_iron_tool.json
 a9b03e3b99a673d01bb7413cc6092c7a9b5be634 data/minecraft/tags/blocks/needs_stone_tool.json