feat: add block of ingot, fix missing tools on nether ore

Signed-off-by: AlasDiablo <25723276+AlasDiablo@users.noreply.github.com>

Author: AlasDiablo

.github/workflows/gradle.yml

@@ -5,9 +5,9 @@ name: Run build
 
 on:
   push:
-    branches: [ 1.17-v6 ]
+    branches: [ '1.18' ]
   pull_request:
-    branches: [ 1.17-v6 ]
+    branches: [ '1.18' ]
 
 jobs:
   build:
@@ -16,10 +16,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 16
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '16'
+          java-version: '17'
           distribution: 'adopt'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

build.gradle

@@ -1,25 +1,31 @@
 buildscript {
     repositories {
         maven { url = 'https://maven.minecraftforge.net' }
+        maven { url = 'https://repo.spongepowered.org/maven' }
+        maven { url = 'https://maven.parchmentmc.org' }
         mavenCentral()
     }
     dependencies {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath 'org.parchmentmc:librarian:1.+'
+        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
 
 apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
+apply plugin: 'org.spongepowered.mixin'
 
 // ***************************************** //
 //                                           //
 //        Standard versioning system         //
 //                                           //
 // ***************************************** //
-def majorVersion = 8
+def majorVersion = 9
 def minorVersion = 2
-def buildVersion = 78
+def buildVersion = 79
 def isExperimental = false
 version = "${majorVersion}.${minorVersion}.${buildVersion}"
 if (isExperimental) {
@@ -57,7 +63,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 def deobfSourceClassifier
 
 minecraft {
-    mappings channel: 'official', version: '1.18.1'
+    mappings channel: 'parchment', version: '2021.12.19-1.18.1'
     deobfSourceClassifier = getMappings().get()
     runs {
         client {
@@ -98,16 +104,21 @@ minecraft {
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
 repositories {
-    maven { url = 'https://www.cursemaven.com/' }
+    maven {
+        url 'https://cursemaven.com'
+        content {
+            includeGroup 'curse.maven'
+        }
+    }
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.18.1-39.0.17'
+    minecraft 'net.minecraftforge:forge:1.18.1-39.0.40'
     implementation fileTree(dir:'lib', include:'*.jar')
-    // implementation 'curse.maven:diabololib-422014:3574175'       // DiaboloLib
     implementation fg.deobf('curse.maven:catalogue-459701:3559402') // Catalogue
     implementation fg.deobf('curse.maven:jei-238222:3569553')       // JEI
-    implementation 'curse.maven:jer-240630:3575594'                 // JER
+    implementation fg.deobf('curse.maven:jer-240630:3575594')       // JER
+    annotationProcessor 'org.spongepowered:mixin:0.8.4:processor'
 }
 
 jar {

changelog.md

@@ -4,6 +4,7 @@
 
 <details><summary><b>1.18.1</b></summary>
 
++ [6.9.2.79](#68278)
 + [6.8.2.78](#68278)
 + [6.7.2.77-experimental](#67277-experimental)
 
@@ -112,6 +113,24 @@
 
 </details>
 
+### 6.9.2.79
+
+#### Fix
+
++ Lapis ore with the wrong harvest level
++ Nether ore without a specified requirement tools (making ore un minable)
++ Add missing ore in the ores tags
+
+#### Add
+
++ Block of each ingot
++ Metal rods (iron, etc.)
++ Gear (wood, iron, etc.)
+
+##### Technical only
+
++ Use parchment as mapping
+
 ### 6.8.2.78
 
 #### Add

…boloLib-3.2.22-deobf-official_1.18.1.jar …24-deobf-parchment_2021.12.19-1.18.1.jarlib/DiaboloLib-3.2.22-deobf-official_1.18.1.jar renamed to lib/DiaboloLib-3.3.24-deobf-parchment_2021.12.19-1.18.1.jar lib/DiaboloLib-3.2.22-deobf-official_1.18.1.jar renamed to lib/DiaboloLib-3.3.24-deobf-parchment_2021.12.19-1.18.1.jar

@@ -69,6 +69,14 @@ public class Registries {
     /* * * * * * * * * * * * * * * Other * * *  * * * * * * * * * * */
     public static final String SCRAP = "scrap";
 
+    /* * * * * * * * * * * * * * * Storage Blocks * * *  * * * * * * * * * * */
+    public static final String ALUMINIUM_BLOCK = "aluminium_block";
+    public static final String LEAD_BLOCK      = "lead_block";
+    public static final String NICKEL_BLOCK    = "nickel_block";
+    public static final String SILVER_BLOCK    = "silver_block";
+    public static final String TIN_BLOCK       = "tin_block";
+    public static final String URANIUM_BLOCK   = "uranium_block";
+
     /* * * * * * * * * * * * * * * Ore * * *  * * * * * * * * * * */
     public static final String BAUXITE_ORE = "bauxite_ore";
     public static final String LEAD_ORE    = "lead_ore";

…loLib-3.2.22-sources-official_1.18.1.jar …-sources-parchment_2021.12.19-1.18.1.jarlib/DiaboloLib-3.2.22-sources-official_1.18.1.jar renamed to lib/DiaboloLib-3.3.24-sources-parchment_2021.12.19-1.18.1.jar lib/DiaboloLib-3.2.22-sources-official_1.18.1.jar renamed to lib/DiaboloLib-3.3.24-sources-parchment_2021.12.19-1.18.1.jar

@@ -137,6 +137,13 @@ protected void addTranslations() {
         this.add(NETHER_TIN_ORE, "Nether Tin Ore");
         this.add(NETHER_URANIUM_ORE, "Nether Uranium Ore");
 
+        this.add(ALUMINIUM_BLOCK, "Block of Aluminium");
+        this.add(LEAD_BLOCK, "Block of Lead");
+        this.add(NICKEL_BLOCK, "Block of Nickel");
+        this.add(SILVER_BLOCK, "Block of Silver");
+        this.add(TIN_BLOCK, "Block of Tin");
+        this.add(URANIUM_BLOCK, "Block of Uranium");
+
         this.add(
                 ((TranslatableComponent) Foundation.ORES_ITEMS_GROUP.getDisplayName()).getKey(),
                 "Janoeo Foundation - Items"

src/main/java/fr/alasdiablo/janoeo/foundation/Registries.java

@@ -137,10 +137,21 @@ protected void addTranslations() {
         this.add(NETHER_TIN_ORE, SimpleUnicode.encodeOf("Minerai d'étain du Nether"));
         this.add(NETHER_URANIUM_ORE, SimpleUnicode.encodeOf("Minerai d'uranium du Nether"));
 
+        this.add(ALUMINIUM_BLOCK, SimpleUnicode.encodeOf("Block of Aluminium"));
+        this.add(LEAD_BLOCK, SimpleUnicode.encodeOf("Block of Lead"));
+        this.add(NICKEL_BLOCK, SimpleUnicode.encodeOf("Block of Nickel"));
+        this.add(SILVER_BLOCK, SimpleUnicode.encodeOf("Block of Silver"));
+        this.add(TIN_BLOCK, SimpleUnicode.encodeOf("Block of Tin"));
+        this.add(URANIUM_BLOCK, SimpleUnicode.encodeOf("Block of Uranium"));
+
         this.add(
                 ((TranslatableComponent) Foundation.ORES_ITEMS_GROUP.getDisplayName()).getKey(),
                 "Janoeo Foundation - Objets"
         );
+        this.add(
+                ((TranslatableComponent) Foundation.GEAR_ITEMS_GROUP.getDisplayName()).getKey(),
+                "Janoeo Foundation - Gear"
+        );
         this.add(
                 ((TranslatableComponent) Foundation.ORES_BLOCKS_GROUP.getDisplayName()).getKey(),
                 "Janoeo Foundation - Blocs"

src/main/java/fr/alasdiablo/janoeo/foundation/data/language/EnglishProvider.java

@@ -137,10 +137,21 @@ protected void addTranslations() {
         this.add(NETHER_TIN_ORE, SimpleUnicode.encodeOf("Mena de estaño del Nether"));
         this.add(NETHER_URANIUM_ORE, SimpleUnicode.encodeOf("Mena de uranio del Nether"));
 
+        this.add(ALUMINIUM_BLOCK, SimpleUnicode.encodeOf("Block of Aluminium"));
+        this.add(LEAD_BLOCK, SimpleUnicode.encodeOf("Block of Lead"));
+        this.add(NICKEL_BLOCK, SimpleUnicode.encodeOf("Block of Nickel"));
+        this.add(SILVER_BLOCK, SimpleUnicode.encodeOf("Block of Silver"));
+        this.add(TIN_BLOCK, SimpleUnicode.encodeOf("Block of Tin"));
+        this.add(URANIUM_BLOCK, SimpleUnicode.encodeOf("Block of Uranium"));
+
         this.add(
                 ((TranslatableComponent) Foundation.ORES_ITEMS_GROUP.getDisplayName()).getKey(),
                 "Janoeo Foundation - Objetos"
         );
+        this.add(
+                ((TranslatableComponent) Foundation.GEAR_ITEMS_GROUP.getDisplayName()).getKey(),
+                "Janoeo Foundation - Gear"
+        );
         this.add(
                 ((TranslatableComponent) Foundation.ORES_BLOCKS_GROUP.getDisplayName()).getKey(),
                 "Janoeo Foundation - Bloques"

src/main/java/fr/alasdiablo/janoeo/foundation/data/language/FrenchProvider.java

@@ -37,6 +37,13 @@ protected void registerModels() {
         );
 
         tinyOres.forEach(block -> cubeAll(block, Folder.TINY_ORE));
+
+
+        List<String> storageBlock = List.of(
+                ALUMINIUM_BLOCK, LEAD_BLOCK, NICKEL_BLOCK, SILVER_BLOCK, TIN_BLOCK, URANIUM_BLOCK
+        );
+
+        storageBlock.forEach(block -> cubeAll(block, Folder.DEFAULT));
     }
 
     private void cubeAll(String blockNameIn, @NotNull Folder folder) {