Bugfixes

+ Obsidian cutting kit now also works on crying obsidian
* Fixed broken fertile soil entry in guidebook
* Fixed improper modname capitalization

Author: Da-Technomancer

gradle.properties

@@ -30,7 +30,7 @@ loader_version_range=[4,)
 # Must match the String constant located in the main mod class annotated with @Mod.
 mod_id=essentials
 # The human-readable display name for the mod.
-mod_name= Essentials
+mod_name=Essentials
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/

src/main/java/com/Da_Technomancer/essentials/ESEventHandlerClient.java

@@ -38,7 +38,7 @@
 
 public class ESEventHandlerClient{
 
-	@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = Essentials.MODID, value = Dist.CLIENT)
+	@EventBusSubscriber(modid = Essentials.MODID, value = Dist.CLIENT)
 	public static class ESModEventsClient{
 
 		@SubscribeEvent

src/main/java/com/Da_Technomancer/essentials/ESEventHandlerCommon.java

@@ -46,7 +46,7 @@
 
 public class ESEventHandlerCommon{
 
-	@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = Essentials.MODID)
+	@EventBusSubscriber(modid = Essentials.MODID)
 	public static class ESModEventsCommon{
 
 		@SuppressWarnings("unused")

src/main/java/com/Da_Technomancer/essentials/items/ESItems.java

@@ -4,6 +4,7 @@
 import com.Da_Technomancer.essentials.api.LinkHelper;
 import com.Da_Technomancer.essentials.integration.ESIntegration;
 import net.minecraft.core.component.DataComponentType;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
@@ -22,7 +23,7 @@ public class ESItems{
 
 	public static CreativeModeTab ESSENTIALS_TAB;
 
-	public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.DataComponents.createDataComponents(Essentials.MODID);
+	public static final DeferredRegister.DataComponents DATA_COMPONENTS = DeferredRegister.DataComponents.createDataComponents(Registries.DATA_COMPONENT_TYPE, Essentials.MODID);
 
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<LinkHelper.LinkedPosition>> LINKING_POS_DATA = DATA_COMPONENTS.registerComponentType("linking_pos", builder -> builder.persistent(LinkHelper.LinkedPosition.CODEC).networkSynchronized(LinkHelper.LinkedPosition.STREAM_CODEC));
 	public static final DeferredHolder<DataComponentType<?>, DataComponentType<CircuitWrench.Selection>> WRENCH_SELECTION_DATA = DATA_COMPONENTS.registerComponentType("wrench_selection", builder -> builder.persistent(CircuitWrench.Selection.CODEC).networkSynchronized(CircuitWrench.Selection.STREAM_CODEC));

src/main/java/com/Da_Technomancer/essentials/items/ObsidianCuttingKit.java

@@ -1,17 +1,22 @@
 package com.Da_Technomancer.essentials.items;
 
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.context.UseOnContext;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.Block;
 
 import java.util.List;
 
 public class ObsidianCuttingKit extends Item{
 
+	private static final TagKey<Block> OBSIDIAN_TAG = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath("c", "obsidians"));
+
 	protected ObsidianCuttingKit(){
 		super(ESItems.baseItemProperties());
 		String name = "obsidian_cutting_kit";
@@ -25,7 +30,7 @@ public void appendHoverText(ItemStack stack, TooltipContext context, List<Compon
 
 	@Override
 	public InteractionResult useOn(UseOnContext context){
-		if(context.getLevel().getBlockState(context.getClickedPos()).getBlock() == Blocks.OBSIDIAN){
+		if(context.getLevel().getBlockState(context.getClickedPos()).is(OBSIDIAN_TAG)){
 			if(!context.getLevel().isClientSide){
 				context.getLevel().destroyBlock(context.getClickedPos(), true);
 				if(context.getPlayer() == null || !context.getPlayer().isCreative()){

src/main/resources/META-INF/neoforge.mods.toml

@@ -26,6 +26,7 @@ modId="${mod_id}" #mandatory
 version="${mod_version}" #mandatory
 
 # A display name for the mod
+displayName="Essentials" #mandatory
 # A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
 

src/main/resources/assets/essentials/patchouli_books/manual/en_us/entries/essentials/fertile_soil.json

@@ -1,31 +1,21 @@
 {
+	"name": "Fertile Soil",
 	"category": "essentials:essentials",
-	"name": "{",
-	"icon": "	"format": 2,",
-	"sortnum": 0,
-	"priority": false,
-	"read_by_default": "true",
+	"icon": "essentials:fertile_soil",
+	"read_by_default": true,
+	"extra_recipe_mappings": {
+		"essentials:fertile_soil": 0
+	},
 	"pages": [
 		{
 			"type": "patchouli:spotlight",
-			"title": "{",
-			"item": "	"format": 2,",
-			"text": "	\"category\": \"essentials:essentials\",$(br2)	\"icon\": \"essentials:fertile_soil\",$(br2)	\"read_by_default\": true,$(br2)	\"extra_recipe_mappings\": {$(br2)"
-		},
-		{
-			"type": "patchouli:text",
-			"text": "		\"essentials:fertile_soil\": 0$(br2)	},$(br2)	\"pages\": [$(br2)		{$(br2)			\"type\": \"patchouli:spotlight\",$(br2)			\"title\": \"Fertile Soil\",$(br2)			\"item\": "
+			"title": "Fertile Soil",
+			"item": "essentials:circuit_wrench",
+			"text": "<item>Fertile Soil/$ is an aid to farming. Plants (crops, saplings, etc.) can be planted on <item>Fertile Soil/$ like it was farmland, and they grow as if on hydrated farmland even without water. They also cannot be trampled.\n\nAt random intervals, the plant on top of the soil will spread to adjacent soil (both to more "
 		},
 		{
 			"type": "patchouli:text",
-			"text": "\"essentials:circuit_wrench\",$(br2)			\"text\": \"<item>Fertile Soil/$ is an aid to farming. Plants (crops, saplings, etc.) can be planted on <item>Fertile Soil/$ like it was farmland, and they grow as if on hydrated farmland even without water. They also cannot be trampled.\n\nAt random intervals, the plant on top of the soil will spread to adjacent soil (both "
-		},
-		{
-			"type": "patchouli:text",
-			"text": "to more <item>Fertile Soil/$ and to regular soil), saving the trouble of replanting and enabling the automation of farming without villagers, as long as you leave at least one plant unharvested.\"$(br2)		}$(br2)	]$(br2)}$(br2)"
+			"text": "<item>Fertile Soil/$ and to regular soil), saving the trouble of replanting and enabling the automation of farming without villagers, as long as you leave at least one plant unharvested."
 		}
-	],
-	"extra_recipe_mappings": {
-		""name": "Fertile Soil"" : 0
-	}
+	]
 }