Updated to Forge 1.17.1-37.0.51 (issue #186). Enabled JEI plugin. Added Shingle Roof recipe from Deep Slate Stairs.

Makefile

@@ -32,30 +32,30 @@ default: mod
 all: clean clean-all mod | install
 
 mod:
-	@echo "[1.16] Building mod using gradle ..."
+	@echo "[1.17] Building mod using gradle ..."
 	@$(GRADLE) build $(GRADLE_OPTS)
 
 run:
-	@echo "[1.16] Run client ..."
+	@echo "[1.17] Run client ..."
 	@$(GRADLE) runClient
 
 assets:
-	@echo "[1.16] Running asset generators ..."
+	@echo "[1.17] Running asset generators ..."
 	@$(TASK) assets
 
 data:
-	@echo "[1.16] Running data generators ..."
+	@echo "[1.17] Running data generators ..."
 	@$(TASK) datagen
 
 clean:
-	@echo "[1.16] Cleaning ..."
+	@echo "[1.17] Cleaning ..."
 	@rm -rf src/generated
 	@rm -rf mcmodsrepo
 	@rm -f build/libs/*
 	@$(GRADLE) clean
 
 clean-all:
-	@echo "[1.16] Cleaning using gradle ..."
+	@echo "[1.17] Cleaning using gradle ..."
 	@rm -rf mcmodsrepo
 	@rm -f dist/*
 	@rm -rf run/logs/
@@ -70,11 +70,11 @@ mrproper: clean-all
 	@rm -f .classpath
 
 init:
-	@echo "[1.16] Initialising eclipse workspace using gradle ..."
+	@echo "[1.17] Initialising eclipse workspace using gradle ..."
 	@$(GRADLE) eclipse
 
 sanitize:
-	@echo "[1.16] Running sanitising tasks ..."
+	@echo "[1.17] Running sanitising tasks ..."
 	@$(TASK) sanitize
 	@$(TASK) sync-languages
 	@$(TASK) version-check
@@ -88,11 +88,11 @@ start-server: install
 	@$(TASK) start-server
 
 dist-check:
-	@echo "[1.16] Running dist checks ..."
+	@echo "[1.17] Running dist checks ..."
 	@$(TASK) dist-check
 
 dist-files: clean-all init mod
-	@echo "[1.16] Distribution files ..."
+	@echo "[1.17] Distribution files ..."
 	@mkdir -p dist
 	@cp build/libs/$(MOD_JAR_PREFIX)* dist/
 	@$(TASK) dist

build.gradle

@@ -53,8 +53,8 @@ minecraft {
 
 dependencies {
   minecraft "net.minecraftforge:forge:${version_forge_minecraft}"
-  //compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api")
-  //runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}")
+  compileOnly fg.deobf("mezz.jei:jei-${version_jei}:api")
+  runtimeOnly fg.deobf("mezz.jei:jei-${version_jei}")
 }
 
 processResources {

gradle.properties

@@ -2,6 +2,6 @@
 org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.17.1
-version_forge_minecraft=1.17.1-37.0.17
-version_jei=1.16.4:7.6.1.63
-version_engineersdecor=1.1.17-b1
+version_forge_minecraft=1.17.1-37.0.51
+version_jei=1.17.1:8.0.0.15
+version_engineersdecor=1.1.17-b2

meta/update.json

@@ -1,6 +1,8 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
   "1.17.1": {
+    "1.1.17-b2": "[F] Updated to Forge 1.17.1-37.0.51 to fix `ToolType not found` startup crash.\n[A] JEI plugin enabled.\n[A] Dark Shingle Roof recipe variant added.",
+    "1.1.17-b1": "[U] Initial MC 1.17.1 port.\n[M] Clinker Brick textures adapted to contemporary MC textures.\n[D] Gas Concrete dropped (Rebar Concrete suffices for texture variation).\n[D] Treated Wood Side Table dropped.\n[M] Updated zh_cn (PR#183, Lyaiya).",
     "1.1.14": "[R] Release build v1.1.14.",
     "1.1.14-b3": "[A] Spanish language support added (PR#180, thx FrannDzs).",
     "1.1.14-b2": "[F] Block Placer: Attempt circumventing external placement prevention.",
@@ -40,6 +42,6 @@
   },
   "promos": {
     "1.17.1-recommended": "1.1.14",
-    "1.17.1-latest": "1.1.14"
+    "1.17.1-latest": "1.1.17-b2"
   }
 }

readme.md

@@ -11,7 +11,11 @@ Mod sources for Minecraft version 1.16.x.
 
 ## Version history
 
-    ~ v1.1.17-b1 [U] Initial MC 1.17.1 port.
+    - v1.1.17-b2 [F] Updated to Forge 1.17.1-37.0.51 to fix `ToolType not found` startup crash.
+                 [A] JEI plugin enabled.
+                 [A] Dark Shingle Roof recipe variant added.
+
+    - v1.1.17-b1 [U] Initial MC 1.17.1 port.
                  [M] Clinker Brick textures adapted to contemporary MC textures.
                  [D] Gas Concrete dropped (Rebar Concrete suffices for texture variation).
                  [D] Treated Wood Side Table dropped.

src/main/java/wile/engineersdecor/ModContent.java

@@ -41,7 +41,6 @@ import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.common.ToolType;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import org.apache.commons.lang3.ArrayUtils;
@@ -307,12 +306,12 @@ public class ModContent
 
   public static final StandardBlocks.BaseBlock DENSE_GRIT_SAND = (StandardBlocks.BaseBlock)(new StandardBlocks.BaseBlock(
     DecorBlock.CFG_DEFAULT,
-    BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f, 3f).sound(SoundType.GRAVEL).harvestTool(ToolType.SHOVEL)
+    BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.1f, 3f).sound(SoundType.GRAVEL)
   )).setRegistryName(new ResourceLocation(MODID, "dense_grit_sand_block"));
 
   public static final StandardBlocks.BaseBlock DENSE_GRIT_DIRT = (StandardBlocks.BaseBlock)(new StandardBlocks.BaseBlock(
     DecorBlock.CFG_DEFAULT,
-    BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.5f, 3f).sound(SoundType.GRAVEL).harvestTool(ToolType.SHOVEL)
+    BlockBehaviour.Properties.of(Material.DIRT, MaterialColor.DIRT).strength(0.1f, 3f).sound(SoundType.GRAVEL)
   )).setRegistryName(new ResourceLocation(MODID, "dense_grit_dirt_block"));
 
   public static final SlabSliceBlock HALFSLAB_DARK_CERAMIC_SHINGLE_ROOF = (SlabSliceBlock)(new SlabSliceBlock(

src/main/java/wile/engineersdecor/eapi/jei/JEIPlugin.java

@@ -7,24 +7,25 @@
  * JEI plugin (see https://github.com/mezz/JustEnoughItems/wiki/Creating-Plugins)
  */
 package wile.engineersdecor.eapi.jei;
-public class JEIPlugin {}
-
 /*
+public class JEIPlugin {}
+*/
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
 import mezz.jei.api.registration.IRecipeCatalystRegistration;
-import wile.engineersdecor.ModEngineersDecor;
-import wile.engineersdecor.ModConfig;
-import wile.engineersdecor.ModContent;
-import wile.engineersdecor.blocks.EdCraftingTable;
 import mezz.jei.api.constants.VanillaRecipeCategoryUid;
 import mezz.jei.api.registration.IRecipeTransferRegistration;
 import mezz.jei.api.constants.VanillaTypes;
 import mezz.jei.api.runtime.IJeiRuntime;
-import net.minecraft.block.Block;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
 import wile.engineersdecor.blocks.EdCraftingTable.CraftingTableTileEntity;
+import wile.engineersdecor.libmc.detail.Auxiliaries;
+import wile.engineersdecor.ModEngineersDecor;
+import wile.engineersdecor.ModConfig;
+import wile.engineersdecor.ModContent;
+import wile.engineersdecor.blocks.EdCraftingTable;
 
 import java.util.HashSet;
 import java.util.List;
@@ -92,4 +93,3 @@ public class JEIPlugin implements mezz.jei.api.IModPlugin
     }
   }
 }
-*/

src/main/resources/data/engineersdecor/recipes/independent/dark_shingle_roof_from_deepslate_recipe.json

@@ -0,0 +1,33 @@
+{
+  "type": "forge:conditional",
+  "recipes": [
+    {
+      "conditions": [
+        {
+          "type": "engineersdecor:optional",
+          "result": "engineersdecor:dark_shingle_roof"
+        }
+      ],
+      "recipe": {
+        "type": "minecraft:crafting_shaped",
+        "pattern": [
+          "D  ",
+          "BD ",
+          "DBD"
+        ],
+        "key": {
+          "B": {
+            "item": "minecraft:brick"
+          },
+          "D": {
+            "item": "minecraft:deepslate_tile_stairs"
+          }
+        },
+        "result": {
+          "item": "engineersdecor:dark_shingle_roof",
+          "count": 6
+        }
+      }
+    }
+  ]
+}