Merge branch 'port/1.21.4' into fix/256

develop/data-generation/advancements.md

@@ -24,7 +24,7 @@ First, we need to make our provider. Create a class that `extends FabricAdvancem
 
 To finish setup, add this provider to your `DataGeneratorEntrypoint` within the `onInitializeDataGenerator` method.
 
-@[code lang=java transclude={24-24}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
+@[code lang=java transclude={25-25}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
 
 ## Advancement Structure {#advancement-structure}
 
@@ -42,8 +42,12 @@ Here's a simple advancement for getting a dirt block:
 
 @[code lang=java transcludeWith=:::datagen-advancements:simple-advancement](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceAdvancementProvider.java)
 
+::: warning
+When building your advancement entries, remember that the function accepts the `Identifier` of the advancement in `String` format!
+:::
+
 ::: details JSON Output
-@[code lang=json](@/reference/latest/src/main/generated/data/fabric-docs-reference/advancement/fabric-docs-reference/get_dirt.json)
+@[code lang=json](@/reference/latest/src/main/generated/data/fabric-docs-reference/advancement/get_dirt.json)
 :::
 
 ## One More Example {#one-more-example}
@@ -52,20 +56,6 @@ Just to get the hang of it, let's add one more advancement. We'll practice addin
 
 @[code lang=java transcludeWith=:::datagen-advancements:second-advancement](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceAdvancementProvider.java)
 
-Don't forget to generate them! Use the terminal command below or the run configuration in IntelliJ.
-
-::: code-group
-
-```sh [Windows]
-gradlew runDatagen
-```
-
-```sh [Linux]
-./gradlew runDatagen
-```
-
-:::
-
 ## Custom Criteria {#custom-criteria}
 
 ::: warning

develop/data-generation/tags.md

@@ -27,7 +27,7 @@ You will need a different provider for each type of tag (eg. one `FabricTagProvi
 
 To finish setup, add this provider to your `DataGeneratorEntrypoint` within the `onInitializeDataGenerator` method.
 
-@[code lang=java transclude={28-28}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
+@[code lang=java transclude={29-29}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
 
 ## Creating a Tag {#creating-a-tag}
 

develop/data-generation/translations.md

@@ -30,7 +30,7 @@ You will need a different provider for each language you want to generate (eg. o
 
 To finish setup, add this provider to your `DataGeneratorEntrypoint` within the `onInitializeDataGenerator` method.
 
-@[code lang=java transclude={26-26}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
+@[code lang=java transclude={27-27}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
 
 ## Creating Translations {#creating-translations}
 

develop/entities/damage-types.md

@@ -55,11 +55,11 @@ You can override `onSteppedOn` to inflict this damage.
 
 We start by creating a `DamageSource` of our custom damage type.
 
-@[code lang=java transclude={21-24}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
+@[code lang=java transclude={22-26}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
 
 Then, we call `entity.damage()` with our `DamageSource` and an amount.
 
-@[code lang=java transclude={25-25}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
+@[code lang=java transclude={27-27}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
 
 The complete block implementation:
 
@@ -72,7 +72,13 @@ Now whenever a living entity steps on our custom block, it'll take 5 damage (2.5
 You can define a death message for the damage type in the format of `death.attack.<message_id>` in our
 mod's `en_us.json` file.
 
-@[code lang=json transclude={4-4}](@/reference/latest/src/main/resources/assets/fabric-docs-reference/lang/en_us.json)
+```json
+{
+  // ...
+  "death.attack.tater": "%1$s died from Tater damage!",
+  // ...
+}
+```
 
 Upon death from our damage type, you'll see the following death message:
 

reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceAdvancementProvider.java

@@ -48,7 +48,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
 				// "got_dirt" is the name referenced by other advancements when they want to have "requirements."
 				.criterion("got_dirt", InventoryChangedCriterion.Conditions.items(Items.DIRT))
 				// Give the advancement an id
-				.build(consumer, FabricDocsReference.MOD_ID + "/get_dirt");
+				.build(consumer, FabricDocsReference.MOD_ID + ":get_dirt");
 		// :::datagen-advancements:simple-advancement
 		// :::datagen-advancements:second-advancement
 		final RegistryWrapper.Impl<Item> itemLookup = wrapperLookup.getOrThrow(RegistryKeys.ITEM);
@@ -66,7 +66,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
 				)
 				.criterion("ate_apple", ConsumeItemCriterion.Conditions.item(wrapperLookup.getOrThrow(RegistryKeys.ITEM), Items.APPLE))
 				.criterion("ate_cooked_beef", ConsumeItemCriterion.Conditions.item(itemLookup, Items.COOKED_BEEF))
-				.build(consumer, FabricDocsReference.MOD_ID + "/apple_and_beef");
+				.build(consumer, FabricDocsReference.MOD_ID + ":apple_and_beef");
 		// :::datagen-advancements:second-advancement
 		// :::datagen-advancements:custom-criteria-advancement
 		AdvancementEntry breakBlockWithTool = Advancement.Builder.create()
@@ -82,7 +82,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
 						false
 				)
 				.criterion("break_block_with_tool", ModCriteria.USE_TOOL.create(new UseToolCriterion.Conditions(Optional.empty())))
-				.build(consumer, FabricDocsReference.MOD_ID + "/break_block_with_tool");
+				.build(consumer, FabricDocsReference.MOD_ID + ":break_block_with_tool");
 		// :::datagen-advancements:custom-criteria-advancement
 		// :::datagen-advancements:new-custom-criteria-advancement
 		AdvancementEntry breakBlockWithToolFiveTimes = Advancement.Builder.create()
@@ -98,7 +98,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
 						false
 				)
 				.criterion("break_block_with_tool_five_times", ModCriteria.PARAMETERIZED_USE_TOOL.create(new ParameterizedUseToolCriterion.Conditions(Optional.empty(), 5)))
-				.build(consumer, FabricDocsReference.MOD_ID + "/break_block_with_tool_five_times");
+				.build(consumer, FabricDocsReference.MOD_ID + ":break_block_with_tool_five_times");
 		// :::datagen-advancements:new-custom-criteria-advancement
 		// :::datagen-advancements:provider-start
 	}

reference/latest/src/client/java/com/example/docs/datagen/internal/FabricDocsReferenceInternalModelProvider.java

@@ -16,7 +16,6 @@
 import com.example.docs.block.custom.PrismarineLampBlock;
 import com.example.docs.item.ModItems;
 
-
 /**
  * This generator is just for the reference item and block models.
  * Not for describing how to use the model provider.

reference/latest/src/main/generated/data/minecraft/advancement/fabric-docs-reference/apple_and_beef.json → reference/latest/src/main/generated/data/fabric-docs-reference/advancement/apple_and_beef.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:fabric-docs-reference/get_dirt",
+  "parent": "fabric-docs-reference:get_dirt",
   "criteria": {
     "ate_apple": {
       "conditions": {

reference/latest/src/main/generated/data/minecraft/advancement/fabric-docs-reference/break_block_with_tool.json → reference/latest/src/main/generated/data/fabric-docs-reference/advancement/break_block_with_tool.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:fabric-docs-reference/get_dirt",
+  "parent": "fabric-docs-reference:get_dirt",
   "criteria": {
     "break_block_with_tool": {
       "trigger": "minecraft:fabric-docs-reference/use_tool"

reference/latest/src/main/generated/data/minecraft/advancement/fabric-docs-reference/break_block_with_tool_five_times.json → reference/latest/src/main/generated/data/fabric-docs-reference/advancement/break_block_with_tool_five_times.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:fabric-docs-reference/break_block_with_tool",
+  "parent": "fabric-docs-reference:break_block_with_tool",
   "criteria": {
     "break_block_with_tool_five_times": {
       "conditions": {

reference/latest/src/main/java/com/example/docs/block/ModBlocks.java

@@ -89,7 +89,7 @@ public static Block register(Block block, RegistryKey<Block> blockKey, boolean s
 		// Sometimes, you may not want to register an item for the block.
 		// Eg: if it's a technical block like `minecraft:air` or `minecraft:end_gateway`
 		if (shouldRegisterItem) {
-	// Items need to be registered with a different type of registry key, but the ID
+			// Items need to be registered with a different type of registry key, but the ID
 			// can be the same.
 			RegistryKey<Item> itemKey = RegistryKey.of(RegistryKeys.ITEM, blockKey.getValue());
 

reference/latest/src/main/java/com/example/docs/item/FabricDocsReferenceItems.java

@@ -2,7 +2,6 @@
 
 import net.fabricmc.api.ModInitializer;
 
-
 // :::1
 public class FabricDocsReferenceItems implements ModInitializer {
 	@Override

reference/latest/src/main/java/com/example/docs/item/armor/GuiditeArmorMaterial.java

@@ -16,7 +16,6 @@
 import com.example.docs.FabricDocsReference;
 
 public class GuiditeArmorMaterial {
-
 	// :::base_durability
 	public static final int BASE_DURABILITY = 15;
 	// :::base_durability
@@ -46,4 +45,4 @@ public class GuiditeArmorMaterial {
 			GUIDITE_ARMOR_MATERIAL_KEY
 	);
 	// :::guidite_armor_material
-}
+}