Skip to content

Commit c17721c

Browse files
authored
Update to 1.21.4: Niche Pages (FabricMC#258)
1 parent 6a29758 commit c17721c

File tree

14 files changed

+26
-87
lines changed

14 files changed

+26
-87
lines changed

develop/data-generation/advancements.md

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ First, we need to make our provider. Create a class that `extends FabricAdvancem
2424

2525
To finish setup, add this provider to your `DataGeneratorEntrypoint` within the `onInitializeDataGenerator` method.
2626

27-
@[code lang=java transclude={24-24}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
27+
@[code lang=java transclude={25-25}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
2828

2929
## Advancement Structure {#advancement-structure}
3030

@@ -42,8 +42,12 @@ Here's a simple advancement for getting a dirt block:
4242

4343
@[code lang=java transcludeWith=:::datagen-advancements:simple-advancement](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceAdvancementProvider.java)
4444

45+
::: warning
46+
When building your advancement entries, remember that the function accepts the `Identifier` of the advancement in `String` format!
47+
:::
48+
4549
::: details JSON Output
46-
@[code lang=json](@/reference/latest/src/main/generated/data/fabric-docs-reference/advancement/fabric-docs-reference/get_dirt.json)
50+
@[code lang=json](@/reference/latest/src/main/generated/data/fabric-docs-reference/advancement/get_dirt.json)
4751
:::
4852

4953
## 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
5256

5357
@[code lang=java transcludeWith=:::datagen-advancements:second-advancement](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceAdvancementProvider.java)
5458

55-
Don't forget to generate them! Use the terminal command below or the run configuration in IntelliJ.
56-
57-
::: code-group
58-
59-
```sh [Windows]
60-
gradlew runDatagen
61-
```
62-
63-
```sh [Linux]
64-
./gradlew runDatagen
65-
```
66-
67-
:::
68-
6959
## Custom Criteria {#custom-criteria}
7060

7161
::: warning

develop/data-generation/tags.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You will need a different provider for each type of tag (eg. one `FabricTagProvi
2727

2828
To finish setup, add this provider to your `DataGeneratorEntrypoint` within the `onInitializeDataGenerator` method.
2929

30-
@[code lang=java transclude={28-28}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
30+
@[code lang=java transclude={29-29}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
3131

3232
## Creating a Tag {#creating-a-tag}
3333

develop/data-generation/translations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You will need a different provider for each langauge you want to generate (eg. o
3030

3131
To finish setup, add this provider to your `DataGeneratorEntrypoint` within the `onInitializeDataGenerator` method.
3232

33-
@[code lang=java transclude={26-26}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
33+
@[code lang=java transclude={27-27}](@/reference/latest/src/client/java/com/example/docs/datagen/FabricDocsReferenceDataGenerator.java)
3434

3535
## Creating Translations {#creating-translations}
3636

develop/entities/damage-types.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ You can override `onSteppedOn` to inflict this damage.
5555

5656
We start by creating a `DamageSource` of our custom damage type.
5757

58-
@[code lang=java transclude={21-24}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
58+
@[code lang=java transclude={22-26}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
5959

6060
Then, we call `entity.damage()` with our `DamageSource` and an amount.
6161

62-
@[code lang=java transclude={25-25}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
62+
@[code lang=java transclude={27-27}](@/reference/latest/src/main/java/com/example/docs/damage/TaterBlock.java)
6363

6464
The complete block implementation:
6565

@@ -72,7 +72,13 @@ Now whenever a living entity steps on our custom block, it'll take 5 damage (2.5
7272
You can define a death message for the damage type in the format of `death.attack.<message_id>` in our
7373
mod's `en_us.json` file.
7474

75-
@[code lang=json transclude={4-4}](@/reference/latest/src/main/resources/assets/fabric-docs-reference/lang/en_us.json)
75+
```json
76+
{
77+
// ...
78+
"death.attack.tater": "%1$s died from Tater damage!",
79+
// ...
80+
}
81+
```
7682

7783
Upon death from our damage type, you'll see the following death message:
7884

reference/1.21/src/client/java/com/example/docs/datagen/util/FabricDocsReferenceInternalModelProvider.java

Lines changed: 0 additions & 54 deletions
This file was deleted.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
4848
// "got_dirt" is the name referenced by other advancements when they want to have "requirements."
4949
.criterion("got_dirt", InventoryChangedCriterion.Conditions.items(Items.DIRT))
5050
// Give the advancement an id
51-
.build(consumer, FabricDocsReference.MOD_ID + "/get_dirt");
51+
.build(consumer, FabricDocsReference.MOD_ID + ":get_dirt");
5252
// :::datagen-advancements:simple-advancement
5353
// :::datagen-advancements:second-advancement
5454
final RegistryWrapper.Impl<Item> itemLookup = wrapperLookup.getOrThrow(RegistryKeys.ITEM);
@@ -66,7 +66,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
6666
)
6767
.criterion("ate_apple", ConsumeItemCriterion.Conditions.item(wrapperLookup.getOrThrow(RegistryKeys.ITEM), Items.APPLE))
6868
.criterion("ate_cooked_beef", ConsumeItemCriterion.Conditions.item(itemLookup, Items.COOKED_BEEF))
69-
.build(consumer, FabricDocsReference.MOD_ID + "/apple_and_beef");
69+
.build(consumer, FabricDocsReference.MOD_ID + ":apple_and_beef");
7070
// :::datagen-advancements:second-advancement
7171
// :::datagen-advancements:custom-criteria-advancement
7272
AdvancementEntry breakBlockWithTool = Advancement.Builder.create()
@@ -82,7 +82,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
8282
false
8383
)
8484
.criterion("break_block_with_tool", ModCriteria.USE_TOOL.create(new UseToolCriterion.Conditions(Optional.empty())))
85-
.build(consumer, FabricDocsReference.MOD_ID + "/break_block_with_tool");
85+
.build(consumer, FabricDocsReference.MOD_ID + ":break_block_with_tool");
8686
// :::datagen-advancements:custom-criteria-advancement
8787
// :::datagen-advancements:new-custom-criteria-advancement
8888
AdvancementEntry breakBlockWithToolFiveTimes = Advancement.Builder.create()
@@ -98,7 +98,7 @@ public void generateAdvancement(RegistryWrapper.WrapperLookup wrapperLookup, Con
9898
false
9999
)
100100
.criterion("break_block_with_tool_five_times", ModCriteria.PARAMETERIZED_USE_TOOL.create(new ParameterizedUseToolCriterion.Conditions(Optional.empty(), 5)))
101-
.build(consumer, FabricDocsReference.MOD_ID + "/break_block_with_tool_five_times");
101+
.build(consumer, FabricDocsReference.MOD_ID + ":break_block_with_tool_five_times");
102102
// :::datagen-advancements:new-custom-criteria-advancement
103103
// :::datagen-advancements:provider-start
104104
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.example.docs.block.custom.PrismarineLampBlock;
1717
import com.example.docs.item.ModItems;
1818

19-
2019
/**
2120
* This generator is just for the reference item and block models.
2221
* Not for describing how to use the model provider.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:fabric-docs-reference/get_dirt",
2+
"parent": "fabric-docs-reference:get_dirt",
33
"criteria": {
44
"ate_apple": {
55
"conditions": {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:fabric-docs-reference/get_dirt",
2+
"parent": "fabric-docs-reference:get_dirt",
33
"criteria": {
44
"break_block_with_tool": {
55
"trigger": "minecraft:fabric-docs-reference/use_tool"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:fabric-docs-reference/break_block_with_tool",
2+
"parent": "fabric-docs-reference:break_block_with_tool",
33
"criteria": {
44
"break_block_with_tool_five_times": {
55
"conditions": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public static Block register(Block block, RegistryKey<Block> blockKey, boolean s
8989
// Sometimes, you may not want to register an item for the block.
9090
// Eg: if it's a technical block like `minecraft:air` or `minecraft:end_gateway`
9191
if (shouldRegisterItem) {
92-
// Items need to be registered with a different type of registry key, but the ID
92+
// Items need to be registered with a different type of registry key, but the ID
9393
// can be the same.
9494
RegistryKey<Item> itemKey = RegistryKey.of(RegistryKeys.ITEM, blockKey.getValue());
9595

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import net.fabricmc.api.ModInitializer;
44

5-
65
// :::1
76
public class FabricDocsReferenceItems implements ModInitializer {
87
@Override

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.example.docs.FabricDocsReference;
1717

1818
public class GuiditeArmorMaterial {
19-
2019
// :::base_durability
2120
public static final int BASE_DURABILITY = 15;
2221
// :::base_durability
@@ -46,4 +45,4 @@ public class GuiditeArmorMaterial {
4645
GUIDITE_ARMOR_MATERIAL_KEY
4746
);
4847
// :::guidite_armor_material
49-
}
48+
}

0 commit comments

Comments
 (0)