New Textures

.gitignore

@@ -1,4 +1,5 @@
 build/
+src/generated/resources/.cache/
 gradle/
 run/
 libs/
@@ -8,14 +9,11 @@ libs/
 *.jar
 *.class
 *~
-.*.swp
 .classpath
 gradlew
-build.number
 gradlew.bat
+build.number
 bin/
 .gradle/
-/bin/
-.project
 .idea/
-src/generated/resources/.cache/cache
+.project

README.md

@@ -10,6 +10,11 @@ Forge mods. I hope I did a good job with it.
 
 TO DO
 -----
+* Add language entries for brick slabs.
+* Investigate doors, they aren't behaving correctly for metal doors.
+* <s>[1.17.1] add missing raw metal textures.</s>
+* <s>[1.17.1] add datagen recipes for raw_metal_blocks & smelting/blasting raw_metal.</s>
+* <s>[1.17.1] add datagen storage block tags for raw_metal blocks.</s>
 * update/move wiki 
 * Decide if we really need more detailed configs than that.
 * Add shears for all metals.

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
     }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -21,25 +21,16 @@ def getVersionAppendage() {
     return "DEV-" + proc.text.trim()
 }
 
-version = "${version_minecraft}-${version_mod}." + getVersionAppendage()
+version = "${version_minecraft}-${version_mod}." + getVersionAppendage() + '-final'
 group = 'mod.alexndr.netherrocks'
 archivesBaseName = 'netherrocks'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
+java.toolchain.languageVersion = JavaLanguageVersion.of(16) 
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
-    // Channel:   Version:
-    // snapshot   YYYYMMDD   Snapshot are built nightly.
-    // stable     #          Stables are built at the discretion of the MCP team.
-    // official   MCVersion  Official field/method names from Mojang mapping files
-    //
-    // You must be aware of the Mojang license when using the 'official' mappings.
-    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-    //
-    // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
     // mappings channel: 'snapshot', version: "${version_snapshot}"
     mappings channel: 'official', version: "${version_minecraft}"
@@ -146,17 +137,20 @@ repositories {
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
+// sourceSets.main.java {
+//     exclude 'mod/alexndr/netherrocks/client/jei/**'
+// }
+
 dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
     minecraft "net.minecraftforge:forge:${version_forge}"
-    compile fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}")
+    implementation fg.deobf("simplecore-api:SimpleCoreLib:${simplecorelib_version}")
   // compile against the JEI API but do not include it at runtime
   compileOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}:api")
   // at runtime, use the full JEI jar
   runtimeOnly fg.deobf("mezz.jei:jei-${version_mcjei}:${jei_version}")
-
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..

gradle.properties

@@ -2,15 +2,15 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-org.gradle.java.home=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+org.gradle.java.home=/usr/lib/jvm/adoptopenjdk-16-hotspot-amd64
 
 # general
-version_minecraft = 1.16.5
-#version_snapshot = 20201028-1.16.3
-version_forge = 1.16.5-36.2.2
+version_minecraft = 1.17.1
+version_forge = 1.17.1-37.1.1
 
 # Simple Ores: Netherrocks
-version_mod = 2.3.6
-simplecorelib_version = 1.16.5-2.0.8.22
-version_mcjei = 1.16.5
-jei_version = 7.6.4.90
+version_mod = 3.0.0
+simplecorelib_version = 1.17.1-3.0.5.3-final
+simpleores_version = 1.17.1-3.0.1.6-final
+version_mcjei = 1.17.1
+jei_version = 8.3.0.45

scripts/generate_jsons.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# scripts are from mod_utils project on my GitHub.
+
+ID='netherrocks'
+NAME='Netherrocks'
+TOPDIR=`pwd`
+PROJNAME=`basename $TOPDIR`
+if [ $PROJNAME != $NAME ]; then
+    echo "Running in wrong directory!"
+    exit 1
+fi
+
+# blockstates
+TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/blockstates
+if [ ! -d $TARGETDIR ]; then
+    mkdir -p $TARGETDIR
+fi
+cd $TARGETDIR
+
+# make simple blockstates
+gen_blockstate_jsons.py --type=simple raw_fyrite_block
+gen_blockstate_jsons.py --type=simple raw_illumenite_block
+gen_blockstate_jsons.py --type=simple raw_argonite_block
+gen_blockstate_jsons.py --type=simple raw_malachite_block
+gen_blockstate_jsons.py --type=slab argonite_brick_slab
+gen_blockstate_jsons.py --type=slab ashstone_brick_slab
+gen_blockstate_jsons.py --type=slab dragonstone_brick_slab
+gen_blockstate_jsons.py --type=slab fyrite_brick_slab
+gen_blockstate_jsons.py --type=slab illumenite_brick_slab
+gen_blockstate_jsons.py --type=slab malachite_brick_slab
+
+# models
+TARGETDIR=${TOPDIR}/src/main/resources/assets/${ID}/models
+if [ ! -d $TARGETDIR ]; then
+    mkdir -p $TARGETDIR
+fi
+cd $TARGETDIR
+
+# block models
+gen_model_jsons.py --type=block raw_fyrite_block
+gen_model_jsons.py --type=block raw_illumenite_block
+gen_model_jsons.py --type=block raw_argonite_block
+gen_model_jsons.py --type=block raw_malachite_block
+gen_model_jsons.py --type=slab argonite_brick_slab
+gen_model_jsons.py --type=slab ashstone_brick_slab
+gen_model_jsons.py --type=slab dragonstone_brick_slab
+gen_model_jsons.py --type=slab fyrite_brick_slab
+gen_model_jsons.py --type=slab illumenite_brick_slab
+gen_model_jsons.py --type=slab malachite_brick_slab
+
+#inventory items
+gen_model_jsons.py --type=inventory --item_only raw_fyrite
+gen_model_jsons.py --type=inventory --item_only raw_illumenite
+gen_model_jsons.py --type=inventory --item_only raw_argonite
+gen_model_jsons.py --type=inventory --item_only raw_malachite
+

src/main/resources/data/forge/tags/items/storage_blocks.json → src/generated/resources/data/forge/tags/blocks/storage_blocks.json

@@ -2,10 +2,14 @@
   "replace": false,
   "values": [
     "#forge:storage_blocks/malachite",
+    "#forge:storage_blocks/fyrite",
+    "#forge:storage_blocks/argonite",
     "#forge:storage_blocks/ashstone",
     "#forge:storage_blocks/dragonstone",
-    "#forge:storage_blocks/argonite",
     "#forge:storage_blocks/illumenite",
-    "#forge:storage_blocks/fyrite"
+    "#forge:storage_blocks/raw_malachite",
+    "#forge:storage_blocks/raw_fyrite",
+    "#forge:storage_blocks/raw_argonite",
+    "#forge:storage_blocks/raw_illumenite"
   ]
-}
+}

src/main/resources/data/forge/tags/items/storage_blocks/ashstone.json → src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_argonite.json

@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "netherrocks:ashstone_block"
+    "netherrocks:raw_argonite_block"
   ]
 }

src/main/resources/data/forge/tags/items/storage_blocks/argonite.json → src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_fyrite.json

@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "netherrocks:argonite_block"
+    "netherrocks:raw_fyrite_block"
   ]
 }

src/main/resources/data/forge/tags/items/storage_blocks/fyrite.json → src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_illumenite.json

@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "netherrocks:fyrite_block"
+    "netherrocks:raw_illumenite_block"
   ]
 }

src/main/resources/data/forge/tags/items/storage_blocks/dragonstone.json → src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_malachite.json

@@ -1,6 +1,6 @@
 {
   "replace": false,
   "values": [
-    "netherrocks:dragonstone_block"
+    "netherrocks:raw_malachite_block"
   ]
 }

src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "netherrocks:argonite_block",
+    "netherrocks:fyrite_block",
+    "netherrocks:illumenite_block",
+    "netherrocks:malachite_block"
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/doors.json

@@ -0,0 +1,11 @@
+{
+  "replace": false,
+  "values": [
+    "netherrocks:argonite_door",
+    "netherrocks:ashstone_door",
+    "netherrocks:dragonstone_door",
+    "netherrocks:fyrite_door",
+    "netherrocks:illumenite_door",
+    "netherrocks:malachite_door"
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -0,0 +1,54 @@
+{
+  "replace": false,
+  "values": [
+    "netherrocks:argonite_block",
+    "netherrocks:argonite_ore",
+    "netherrocks:argonite_bars",
+    "netherrocks:argonite_brick_slab",
+    "netherrocks:argonite_brick_stairs",
+    "netherrocks:argonite_bricks",
+    "netherrocks:argonite_door",
+    "netherrocks:ashstone_block",
+    "netherrocks:ashstone_ore",
+    "netherrocks:ashstone_bars",
+    "netherrocks:ashstone_brick_slab",
+    "netherrocks:ashstone_brick_stairs",
+    "netherrocks:ashstone_bricks",
+    "netherrocks:ashstone_door",
+    "netherrocks:dragonstone_ore",
+    "netherrocks:dragonstone_block",
+    "netherrocks:dragonstone_bars",
+    "netherrocks:dragonstone_brick_slab",
+    "netherrocks:dragonstone_brick_stairs",
+    "netherrocks:dragonstone_bricks",
+    "netherrocks:dragonstone_door",
+    "netherrocks:fyrite_block",
+    "netherrocks:fyrite_ore",
+    "netherrocks:fyrite_bars",
+    "netherrocks:fyrite_brick_slab",
+    "netherrocks:fyrite_brick_stairs",
+    "netherrocks:fyrite_bricks",
+    "netherrocks:fyrite_door",
+    "netherrocks:illumenite_block",
+    "netherrocks:illumenite_ore",
+    "netherrocks:illumenite_bars",
+    "netherrocks:illumenite_brick_slab",
+    "netherrocks:illumenite_brick_stairs",
+    "netherrocks:illumenite_bricks",
+    "netherrocks:illumenite_door",
+    "netherrocks:malachite_block",
+    "netherrocks:malachite_ore",
+    "netherrocks:malachite_bars",
+    "netherrocks:malachite_brick_slab",
+    "netherrocks:malachite_brick_stairs",
+    "netherrocks:malachite_bricks",
+    "netherrocks:malachite_door",
+    "netherrocks:raw_argonite_block",
+    "netherrocks:raw_fyrite_block",
+    "netherrocks:raw_illumenite_block",
+    "netherrocks:raw_malachite_block",
+    "netherrocks:nether_blast_furnace",
+    "netherrocks:nether_furnace",
+    "netherrocks:nether_smoker"
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/needs_diamond_tool.json

@@ -0,0 +1,27 @@
+{
+  "replace": false,
+  "values": [
+    "netherrocks:argonite_block",
+    "netherrocks:argonite_ore",
+    "netherrocks:argonite_bars",
+    "netherrocks:argonite_brick_slab",
+    "netherrocks:argonite_brick_stairs",
+    "netherrocks:argonite_bricks",
+    "netherrocks:argonite_door",
+    "netherrocks:ashstone_block",
+    "netherrocks:ashstone_ore",
+    "netherrocks:ashstone_bars",
+    "netherrocks:ashstone_brick_slab",
+    "netherrocks:ashstone_brick_stairs",
+    "netherrocks:ashstone_bricks",
+    "netherrocks:ashstone_door",
+    "netherrocks:dragonstone_block",
+    "netherrocks:dragonstone_ore",
+    "netherrocks:dragonstone_bars",
+    "netherrocks:dragonstone_brick_slab",
+    "netherrocks:dragonstone_brick_stairs",
+    "netherrocks:dragonstone_bricks",
+    "netherrocks:dragonstone_door",
+    "netherrocks:raw_argonite_block"
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json

@@ -0,0 +1,29 @@
+{
+  "replace": false,
+  "values": [
+    "netherrocks:fyrite_block",
+    "netherrocks:fyrite_ore",
+    "netherrocks:fyrite_bars",
+    "netherrocks:fyrite_brick_slab",
+    "netherrocks:fyrite_brick_stairs",
+    "netherrocks:fyrite_bricks",
+    "netherrocks:fyrite_door",
+    "netherrocks:illumenite_block",
+    "netherrocks:illumenite_ore",
+    "netherrocks:illumenite_bars",
+    "netherrocks:illumenite_brick_slab",
+    "netherrocks:illumenite_brick_stairs",
+    "netherrocks:illumenite_bricks",
+    "netherrocks:illumenite_door",
+    "netherrocks:malachite_block",
+    "netherrocks:malachite_ore",
+    "netherrocks:malachite_bars",
+    "netherrocks:malachite_brick_slab",
+    "netherrocks:malachite_brick_stairs",
+    "netherrocks:malachite_bricks",
+    "netherrocks:malachite_door",
+    "netherrocks:raw_fyrite_block",
+    "netherrocks:raw_illumenite_block",
+    "netherrocks:raw_malachite_block"
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/slabs.json

@@ -0,0 +1,11 @@
+{
+  "replace": false,
+  "values": [
+    "netherrocks:argonite_brick_slab",
+    "netherrocks:ashstone_brick_slab",
+    "netherrocks:dragonstone_brick_slab",
+    "netherrocks:fyrite_brick_slab",
+    "netherrocks:illumenite_brick_slab",
+    "netherrocks:malachite_brick_slab"
+  ]
+}

src/generated/resources/data/minecraft/tags/blocks/stairs.json

@@ -0,0 +1,11 @@
+{
+  "replace": false,
+  "values": [
+    "netherrocks:argonite_brick_stairs",
+    "netherrocks:ashstone_brick_stairs",
+    "netherrocks:dragonstone_brick_stairs",
+    "netherrocks:fyrite_brick_stairs",
+    "netherrocks:illumenite_brick_stairs",
+    "netherrocks:malachite_brick_stairs"
+  ]
+}