Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework the Client Resources chapter #62

Merged
merged 46 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
312442d
rework registries and resource location documentation
IchHabeHunger54 Jan 29, 2024
aafbf1b
rework side documentation
IchHabeHunger54 Jan 29, 2024
a748304
rework events and lifecycle documentation
IchHabeHunger54 Jan 29, 2024
4b2d021
fix broken links
IchHabeHunger54 Jan 29, 2024
c49ff55
fix some mistakes regarding `DeferredRegister.Blocks`
IchHabeHunger54 Jan 31, 2024
242abf0
add side checks in the event handlers
IchHabeHunger54 Jan 31, 2024
a4971bd
fix some of the mistakes in registries.md
IchHabeHunger54 Jan 31, 2024
9950d51
remove mention of registry int id syncing (it is discouraged)
IchHabeHunger54 Feb 21, 2024
f64b8fe
Merge remote-tracking branch 'upstream/main'
IchHabeHunger54 Feb 21, 2024
a1bd87d
update datapack registry datagen
IchHabeHunger54 Feb 21, 2024
31b5bf2
registry querying
IchHabeHunger54 Feb 21, 2024
ff5d5b1
add back int ID syncing, with a big disclaimer
IchHabeHunger54 Feb 21, 2024
965be16
update sync disclaimer
IchHabeHunger54 Feb 21, 2024
2e65131
address most feedback by ChampionAsh
IchHabeHunger54 Feb 22, 2024
1ed292c
Update docs/blocks/index.md
IchHabeHunger54 Feb 22, 2024
e2fbc31
Update docs/concepts/registries.md
IchHabeHunger54 Feb 22, 2024
40c17a9
implement most of XFact's feedback
IchHabeHunger54 Feb 23, 2024
7a24414
fix datapack registry creation
IchHabeHunger54 Feb 23, 2024
55873a1
remove recommendation of separate DR and DH classes
IchHabeHunger54 Feb 23, 2024
cdf58f2
fix an oversight
IchHabeHunger54 Feb 23, 2024
380db40
Update docs/blocks/index.md
IchHabeHunger54 Feb 23, 2024
2a369a7
BootstapContext :screm:
IchHabeHunger54 Feb 25, 2024
b1e1966
Merge remote-tracking branch 'origin/main'
IchHabeHunger54 Feb 25, 2024
b5a78bb
fix two wrong mentions of Registries
IchHabeHunger54 Feb 26, 2024
b6dcbb9
fix exception name
IchHabeHunger54 Feb 26, 2024
8d54466
Merge remote-tracking branch 'upstream/main'
IchHabeHunger54 Mar 3, 2024
90c3b4a
Merge remote-tracking branch 'upstream/main'
IchHabeHunger54 Mar 3, 2024
3c74c22
merge resources and datagen index pages into one rewritten index page
IchHabeHunger54 Mar 4, 2024
d72f76d
write a proper i18n article, replacing the separate i18n, component a…
IchHabeHunger54 Mar 4, 2024
bc2c4f5
rewrite the models article and merge model extension articles into it…
IchHabeHunger54 Mar 17, 2024
bcb0f4b
model datagen article
IchHabeHunger54 Mar 17, 2024
3b602be
update contributing guidelines to use json5 instead of js for json co…
IchHabeHunger54 Mar 17, 2024
fd6289d
custom model loaders: part 1
IchHabeHunger54 Mar 19, 2024
72defaf
custom model loaders: part 2
IchHabeHunger54 Mar 19, 2024
28fe6e1
baked models
IchHabeHunger54 Mar 20, 2024
01123e2
sounds article, and some restructuring
IchHabeHunger54 Mar 20, 2024
7561f80
cleanup some related articles
IchHabeHunger54 Mar 21, 2024
f6971bf
particles
IchHabeHunger54 Mar 26, 2024
7c5c9fd
Merge remote-tracking branch 'upstream/main' into rework/assets
IchHabeHunger54 Mar 26, 2024
138bb3b
fix links to old particle article
IchHabeHunger54 Mar 26, 2024
3fde621
apply feedback by @ChampionAsh5357
IchHabeHunger54 Mar 28, 2024
b3b1a7b
remove TODOs
IchHabeHunger54 Mar 28, 2024
a57f32d
Champ's reviews, part 2
IchHabeHunger54 Mar 31, 2024
40de698
apply Embeddedt's and XFactHD's feedback
IchHabeHunger54 Apr 8, 2024
05803d8
apply feedback regarding BakedModel#getRenderTypes
IchHabeHunger54 Apr 17, 2024
ed4e02b
apply another round of XFact's feedback
IchHabeHunger54 Apr 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions docs/blocks/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,7 @@ This does the exact same as the previous example, but is slightly shorter. Of co

### Resources

If you register your block and place it in the world, you will find it to be missing things like a texture. This is because textures, among others, are handled by Minecraft's resource system.

To apply a simple texture to a block, you must add a blockstate JSON, a model JSON, and a texture PNG. See the section on [resources] for more information.
If you register your block and place it in the world, you will find it to be missing things like a texture. This is because [textures], among others, are handled by Minecraft's resource system. To apply the texture to the block, you must provide a [model] and a [blockstate file][bsfile] that associates the block with the texture and a shape. Give the linked articles a read for more information.

## Using Blocks

Expand Down Expand Up @@ -229,12 +227,15 @@ Random ticking is used by a wide range of mechanics in Minecraft, such as plant
[below]: #deferredregisterblocks-helpers
[blockentities]: ../blockentities/index.md
[blockstates]: states.md
[bsfile]: ../resources/client/models/index.md#blockstate-files
[events]: ../concepts/events.md
[interactionpipeline]: ../items/interactionpipeline.md
[item]: ../items/index.md
[model]: ../resources/client/models/index.md
[randomtick]: #random-ticking
[registration]: ../concepts/registries.md#methods-for-registering
[resources]: ../resources/client/index.md
[sounds]: ../gameeffects/sounds.md
[resources]: ../resources/index.md#assets
[sounds]: ../resources/client/sounds.md
[textures]: ../resources/client/textures.md
[usingblocks]: #using-blocks
[usingblockstates]: states.md#using-blockstates
90 changes: 0 additions & 90 deletions docs/concepts/internationalization.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/concepts/registries.md
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static void onGatherData(GatherDataEvent event) {
[blockentity]: ../blockentities/index.md
[codec]: ../datastorage/codecs.md
[datagen]: #data-generation-for-datapack-registries
[datagenindex]: ../datagen/index.md
[datagenindex]: ../resources/index.md#data-generation
[datapack]: ../resources/server/index.md
[defregblocks]: ../blocks/index.md#deferredregisterblocks-helpers
[defregitems]: ../items/index.md#deferredregisteritems
Expand Down
3 changes: 3 additions & 0 deletions docs/datagen/_category_.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"label": "Datagen"
}
File renamed without changes.
3 changes: 0 additions & 3 deletions docs/datagen/client/_category_.json

This file was deleted.

41 changes: 0 additions & 41 deletions docs/datagen/client/localization.md

This file was deleted.

Loading
Loading