Skip to content

Commit 9d876b2

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/upstream/1.21.1' into dev/1.21.10
# Conflicts: # .github/workflows/build.yml # .github/workflows/release.yml # buildSrc/build.gradle.kts # fabric-api-lookup-api-v1/src/main/java/net/fabricmc/fabric/impl/lookup/custom/ApiLookupMapImpl.java # fabric-block-view-api-v2/src/main/resources/fabric-block-view-api-v2.mixins.json # fabric-blockrenderlayer-v1/src/client/java/net/fabricmc/fabric/impl/blockrenderlayer/BlockRenderLayerMapImpl.java # fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/impl/content/registry/FlammableBlockRegistryImpl.java # fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java # fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java # fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java # fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java # fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/chests.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/cobblestones.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/ores.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_logs.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/stripped_woods.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/chests.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/cobblestones.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ores/quartz.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/potions.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_logs.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/stripped_woods.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_dense_vegetation.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_temperate/overworld.json # fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json # fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBiomeTags.java # fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java # fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java # fabric-convention-tags-v2/src/main/resources/assets/fabric-convention-tags-v2/lang/ko_kr.json # fabric-convention-tags-v2/src/testmod/java/net/fabricmc/fabric/test/tag/convention/v2/TagUtilTest.java # fabric-data-attachment-api-v1/build.gradle # fabric-data-attachment-api-v1/src/client/resources/fabric-data-attachment-api-v1.client.mixins.json # fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentRegistry.java # fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/api/attachment/v1/AttachmentType.java # fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentEntrypoint.java # fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/impl/attachment/AttachmentRegistryImpl.java # fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/IAttachmentHolderMixin.java # fabric-data-attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WorldChunkMixin.java # fabric-data-attachment-api-v1/src/main/resources/fabric-data-attachment-api-v1.mixins.json # fabric-data-attachment-api-v1/src/main/resources/fabric.mod.json # fabric-data-attachment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/AttachmentTestMod.java # fabric-data-attachment-api-v1/src/testmod/resources/fabric.mod.json # fabric-lifecycle-events-v1/README.md # fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/MinecraftClientMixin.java # fabric-lifecycle-events-v1/src/testmodClient/java/net/fabricmc/fabric/test/event/lifecycle/client/ClientLifecycleTests.java # fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelLoaderMixin.java # fabric-model-loading-api-v1/src/client/resources/fabric-model-loading-api-v1.mixins.json # fabric-networking-api-v1/src/client/java/net/fabricmc/fabric/mixin/networking/client/ClientPlayNetworkHandlerMixin.java # fabric-networking-api-v1/src/client/java/org/sinytra/fabric/networking_api/client/NeoClientPlayNetworking.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/AttachmentTargetImpl.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/FabricRegistryByteBuf.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentChange.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentSync.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentSyncException.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/AttachmentTargetInfo.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/SupportedAttachmentsClientConnection.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/c2s/AcceptedAttachmentsPayloadC2S.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/s2c/AttachmentSyncPayloadS2C.java # fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/sync/s2c/RequestAcceptedAttachmentsPayloadS2C.java # fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/api/event/registry/RegistryEntryAddedCallback.java # fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java # fabric-renderer-indigo/src/client/resources/fabric.mod.json # fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/ArmorRendererRegistryImpl.java # fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/BlockEntityRendererRegistryImpl.java # fabric-rendering-v1/src/client/java/net/fabricmc/fabric/impl/client/rendering/EntityModelLayerImpl.java # fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ArmorFeatureRendererMixin.java # fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/BlockColorsMixin.java # fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/ItemColorsMixin.java # fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json # fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java # fabric-screen-api-v1/src/client/resources/fabric-screen-api-v1.mixins.json # fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/impl/transfer/fluid/WaterPotionStorage.java # fabric-transfer-api-v1/src/main/java/org/sinytra/fabric/transfer_api/compat/FluidStorageFluidHandler.java # fabric-transfer-api-v1/src/main/java/org/sinytra/fabric/transfer_api/compat/ItemStorageItemHandler.java # fabric-transfer-api-v1/src/test/java/net/fabricmc/fabric/test/transfer/unittests/FluidItemTests.java # fabric-transitive-access-wideners-v1/build.gradle # fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener # ffapi.gradle.properties # gradle.properties # gradle/wrapper/gradle-wrapper.properties
2 parents c49a6eb + e00d60c commit 9d876b2

File tree

155 files changed

+2929
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+2929
-21
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: 🐞 Bug Report
2+
description: Report an issue you've encountered
3+
labels: [ bug ]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: "## 👋 Welcome!"
8+
- type: markdown
9+
attributes:
10+
value: |
11+
### 📋 Checklist
12+
Thank you for taking your time to report this bug!
13+
Before reporting, please ensure that:
14+
- You are using the **latest** available version of Forgified Fabric API
15+
- You've installed a **minimal set of mods** required to reproduce the issue.
16+
Issues with modpacks and excessive amount of mods will *not* be accepted, as they take a long time to diagnose.
17+
Knowing which mods are causing problems allows us to focus on fixing the issue as soon as possible.
18+
If you're unsure which mods might be at fault, try using [binary search](https://www.reddit.com/r/feedthebeast/comments/evpy6r/tips_for_modpack_authors_how_to_find_misbehaving/) - removing half of installed mods
19+
repeatedly until the faulty mod is found.
20+
21+
> [!WARNING]
22+
> Note: Custom server APIs (such as Mohist, Magma, Arclight) are **not supported**.
23+
> This also applies to launchers for mobile platforms (Pojav, FoldCraft).
24+
- type: dropdown
25+
id: version
26+
attributes:
27+
label: Minecraft version
28+
description: What version of Minecraft are you running? Please note that only the versions listed below are supported. If you're running an outdated version, update to receive support.
29+
options:
30+
- "1.21.1"
31+
- "1.20.1 (LTS)"
32+
default: 0
33+
validations:
34+
required: true
35+
- type: input
36+
id: description
37+
attributes:
38+
label: Describe the bug
39+
description: "A clear and concise description of what the bug is."
40+
validations:
41+
required: true
42+
- type: textarea
43+
id: repro
44+
attributes:
45+
label: Steps to reproduce
46+
description: |
47+
How do you trigger this bug? Please walk us through it step by step.
48+
If applicable, add screenshots to help explain your problem.
49+
value: |
50+
1.
51+
2.
52+
3.
53+
...
54+
validations:
55+
required: true
56+
- type: input
57+
id: logs
58+
attributes:
59+
label: Logs
60+
description: |
61+
If applicable (crash, error output in console), please provide your debug.log **and** crash report
62+
To upload logs, use an external paste site, such as [Github Gist](https://gist.github.com/) (recommended), [Ubuntu Pastebin](https://paste.ubuntu.com/) or [Pastebin](http://pastebin.com)
63+
- type: textarea
64+
id: context
65+
attributes:
66+
label: Additional context
67+
description: "Add any other context about the problem here, such as your current environment or other mods that might be causing this bug."

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
blank_issues_enabled: true
22
contact_links:
3-
- name: FabricMC Discord
4-
url: https://discord.gg/v6v4pMv
5-
about: Please ask here for help with installing Fabric.
3+
- name: Sinytra Discord
4+
url: https://discord.sinytra.org
5+
about: Please ask here for help with installing Forgified Fabric API.
66
- name: GitHub Discussions
7-
url: https://github.com/FabricMC/fabric/discussions
8-
about: Please look here for frequently asked questions and questions on how to use Fabric API.
7+
url: https://github.com/Sinytra/ForgifiedFabricAPI/discussions
8+
about: Please look here for frequently asked questions and questions on how to use Forgified Fabric API.

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ jobs:
1111
options: --user root
1212
steps:
1313
- run: apt update && apt install git -y && git --version
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
fetch-depth: 0
17-
- uses: gradle/actions/wrapper-validation@v4
17+
- uses: gradle/actions/wrapper-validation@v5
1818
- name: Setup Gradle
19-
uses: gradle/actions/setup-gradle@v4
19+
uses: gradle/actions/setup-gradle@v5
2020
with:
2121
gradle-home-cache-cleanup: true
2222
- name: Setup env properties

build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,14 @@ allprojects {
206206
}
207207
}
208208

209+
loom.runs {
210+
listOf("client", "server").forEach { run ->
211+
named(run) {
212+
mods.addAll(loom.mods.filterNot { it.name.contains("test") })
213+
}
214+
}
215+
}
216+
209217
publishMods {
210218
file.set(tasks.jar.flatMap { it.archiveFile })
211219
changelog.set(providers.environmentVariable("CHANGELOG").orElse("# ${project.version}"))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:ender_chest"
4+
]
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:trapped_chest"
4+
]
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:cobbled_deepslate"
4+
]
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:infested_cobblestone"
4+
]
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:mossy_cobblestone"
4+
]
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"minecraft:cobblestone"
4+
]
5+
}

0 commit comments

Comments
 (0)