Skip to content

Commit 0cf578d

Browse files
its-miromaits-miroma
authored
some changes (FabricMC#497)
* some changes * ci: fix error caused by `\0` * set tab-size to 2 spaces remove unused .homepage-container
1 parent b1a980f commit 0cf578d

16 files changed

Lines changed: 36 additions & 54 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
reports: reference/**/build/reports/checkstyle/*.xml
4949
# require clean working directory
5050
- run: |
51-
files="$(git ls-files --modified --others --exclude-standard -z)"
52-
[[ -z "${files}" ]] && exit 0
53-
while IFS= read -r -d '' f; do
51+
readarray -d '' files < <(git ls-files --modified --others --exclude-standard -z)
52+
[[ ${#files[@]} -eq 0 ]] && exit 0
53+
for f in "${files[@]}"; do
5454
echo "::error file=${f},title=Datagen::Regenerate this file with 'cd reference && ./gradlew runDatagen'"
55-
done <<<"${files}"
55+
done
5656
exit 1
5757
5858
# :::automatic-testing:game-test:3

‎.github/workflows/format.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ jobs:
4545
- run: npm ci
4646
- run: npx prettier --write .
4747
- run: |
48-
files="$(git ls-files --modified --others --exclude-standard -z)"
49-
[[ -z "${files}" ]] && exit 0
50-
while IFS= read -r -d '' f; do
48+
readarray -d '' files < <(git ls-files --modified --others --exclude-standard -z)
49+
[[ ${#files[@]} -eq 0 ]] && exit 0
50+
for f in "${files[@]}"; do
5151
echo "::error file=${f},title=Prettier::Format this file with 'npx prettier --write \"${f}\"'"
52-
done <<<"${files}"
52+
done
5353
exit 1

‎.github/workflows/l10n-pull.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ jobs:
6969
title: ${{ steps.message.outputs.message }}
7070
body: ""
7171
commit-message: ${{ steps.message.outputs.message }}
72+
author: Fabric Bot <159731069+FabricMCBot@users.noreply.github.com>
7273
branch: l10n/${{ github.ref_name }}
7374
labels: i18n-l10n
7475
draft: always-true

‎.vitepress/i18n.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ export const getLocales = () => {
257257
},
258258
{
259259
icon: "discord",
260-
link: "https://discord.gg/v6v4pMv",
260+
link: "https://discord.fabricmc.net/",
261261
ariaLabel: resolver("social.discord"),
262262
},
263263
{

‎.vitepress/theme/style.css‎

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,17 @@
4040
--vp-font-family-base: "Punctuation SC", var(--font-family-base);
4141
}
4242

43+
code,
44+
pre {
45+
tab-size: 2 !important;
46+
}
47+
4348
/* Sidebar Scrollbar - Styles scrollbars within the side navigation pane for improved visibility. */
4449
.VPSidebar {
4550
scrollbar-width: thin;
4651
scrollbar-color: var(--vp-c-gray-1) var(--vp-c-bg-alt);
4752
}
4853

49-
/* Custom scrollbar visuals for WebKit-based browsers */
5054
::-webkit-scrollbar {
5155
width: 12px;
5256
}
@@ -59,33 +63,11 @@
5963
background: var(--vp-c-gray-1);
6064
}
6165

62-
/* Homepage Container - Center content and limit maximum width. */
63-
.homepage-container {
64-
margin: auto;
65-
width: 100%;
66-
max-width: 1280px;
67-
padding: 0 24px;
68-
}
69-
7066
/* Override default margin on the VitePress Home component */
7167
.VPHome {
7268
margin-bottom: 0px !important;
7369
}
7470

75-
/* Responsive Adjustments - Increase padding for wider screens. */
76-
@media (min-width: 640px) {
77-
.homepage-container {
78-
padding: 0 48px;
79-
}
80-
}
81-
82-
@media (min-width: 960px) {
83-
.homepage-container {
84-
width: 100%;
85-
padding: 0 64px;
86-
}
87-
}
88-
8971
/* Local Search Box Animations - Fade in backdrop and animate search box on appearance. */
9072
.VPLocalSearchBox > .backdrop {
9173
opacity: 0;
@@ -99,6 +81,13 @@
9981
transform-origin: top center;
10082
}
10183

84+
@keyframes show {
85+
100% {
86+
opacity: 1;
87+
transform: none;
88+
}
89+
}
90+
10291
/* Medium Zoom Overlays - Increase stacking order for zoomed images and their overlay. */
10392
.medium-zoom-overlay {
10493
z-index: 10000;
@@ -108,14 +97,6 @@
10897
z-index: 10001;
10998
}
11099

111-
/* Simple keyframe animation for fading/showing elements */
112-
@keyframes show {
113-
100% {
114-
opacity: 1;
115-
transform: none;
116-
}
117-
}
118-
119100
/* Style <kbd> elements except the search popup */
120101
kbd:not(.DocSearch-Button-Key) {
121102
background-color: #eee !important;

‎.vscode/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"recommendations": ["davidanson.vscode-markdownlint", "prettier.prettier-vscode", "vue.volar"]
2+
"recommendations": ["davidanson.vscode-markdownlint", "esbenp.prettier-vscode", "vue.volar"]
33
}

‎develop/data-generation/block-models.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ This method will generate models for a normal cube, that uses the texture file `
6565

6666
::: tip
6767

68-
If you're stuck choosing which `TextureModel` you should use, open the `TexturedModel` class and look at the [`TextureMaps`](#using-texture-map)!
68+
If you're stuck choosing which `TextureModel` you should use, open the `TexturedModel` class and look at the [`TextureMapping`s](#using-texture-map)!
6969

7070
:::
7171

@@ -173,7 +173,7 @@ The `TextureSlot`s represent the "placeholders" (`#bottom`, `#top`, ...) as an O
173173

174174
What does `TextureMapping` do? It actually provides the identifiers that point to the textures. It technically behaves like a normal map - you associate a `TextureSlot` (key) with an `Identifier` (value).
175175

176-
You can either use the vanilla ones, like `TextureMapping.cube()`(which associates all `TextureKeys` with the same `Identifier`), or create a new one, by creating a new instance and then using `.put()` to associate keys with values.
176+
You can either use the vanilla ones, like `TextureMapping.cube()`(which associates all `TextureSlot`s with the same `Identifier`), or create a new one, by creating a new instance and then using `.put()` to associate keys with values.
177177

178178
::: tip
179179

@@ -189,7 +189,7 @@ The `bottom` and `top` faces will use `oak_log_top.png`, the sides will use `oak
189189

190190
::: warning
191191

192-
All `TextureSlot`s in the TextureMap **have to** match all `TextureSlot`s in your parent block model!
192+
All `TextureSlot`s in the TextureMapping **have to** match all `TextureSlot`s in your parent block model!
193193

194194
:::
195195

‎develop/entities/damage-types.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Upon death from our damage type, you'll see the following death message:
8282

8383
### Damage Type Tags {#damage-type-tags}
8484

85-
Some damage types can bypass armor, bypass status effects, and such. Tags are used to control these kinds of properties
85+
Some damage types can bypass armor, bypass mob effects, and such. Tags are used to control these kinds of properties
8686
of damage types.
8787

8888
You can find existing damage type tags in `data/minecraft/tags/damage_type`.

‎develop/getting-started/intellij-idea/generating-sources.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ next:
1313

1414
The Fabric toolchain lets you access the Minecraft source code by generating it locally, and you can use IntelliJ IDEA to conveniently navigate through it. To generate sources, you need to run the `genSources` Gradle task.
1515

16-
This can be done from the Gradle View like above, by running the `genSources` task in **Tasks** > **`fabric`**:
16+
This can be done from the Gradle panel, by running the `genSources` task in **Tasks** > **`fabric`**:
1717
![`genSources` Task in Gradle Panel](/assets/develop/getting-started/intellij/gradle-gensources.png)
1818

1919
Or you can also run the command from the terminal:
@@ -30,7 +30,7 @@ IntelliJ requires one additional step of attaching generated sources to the proj
3030

3131
To do this, open any Minecraft class. You can <kbd>Ctrl</kbd> + Click to go to the definition, which opens the class or use "Search everywhere" to open a class.
3232

33-
Lets open `MinecraftServer.class` as an example. You should now see a blue banner on the top with a "**Choose Sources...**" link.
33+
Let's open `MinecraftServer.class` as an example. You should now see a blue banner on the top with a "**Choose Sources...**" link.
3434

3535
![Choose Sources](/assets/develop/getting-started/intellij/choose-sources.png)
3636

‎develop/getting-started/vscode/generating-sources.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ next:
1313

1414
The Fabric toolchain lets you access the Minecraft source code by generating it locally, and you can use Visual Studio Code to conveniently navigate through it. To generate sources, you need to run the `genSources` Gradle task.
1515

16-
This can be done from the Gradle View like above, by running the `genSources` task in **Tasks** > **`fabric`**:
16+
This can be done from the Gradle view, by running the `genSources` task in **Tasks** > **`fabric`**:
1717
![`genSources` Task in Gradle View](/assets/develop/getting-started/vscode/gradle-gensources.png)
1818

1919
Or you can also run the command from the terminal:

0 commit comments

Comments
 (0)