Quiltify 1.21.1 by OroArmor · Pull Request #170 · QuiltMC/quilted-fabric-api

OroArmor · 2024-08-16T05:18:19Z

No description provided.

* New translations en_us.json (Korean) * New translations en_us.json (Japanese) * New translations en_us.json (German) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Italian)

…he OP tab is disabled (FabricMC#4045)

* after damage event * add after damage event to testmod * remove amount > 0 check to capture shield blocking * add javadoc * dont fire event if killed * clarify javadoc a bit more * fix checkstyle issue * fix other checkstyle issues lol * rename damageDealt to baseDamageTaken

* Add `c:animal_foods` tag * checkstyle * Spotless * Add to lang generator * Actually use the generated lang file --------- Co-authored-by: modmuss50 <modmuss50@gmail.com>

* New translations en_us.json (Portuguese, Brazilian) * New translations en_us.json (Malay) * New translations en_us.json (Korean) * New translations en_us.json (Malay (Jawi)) * New translations en_us.json (Malay (Jawi)) * New translations en_us.json (Malay (Jawi)) * New translations en_us.json (Polish) * New translations en_us.json (Portuguese, Brazilian)

…bricMC#4058)

* Add TransferVariant.getComponentMap() * used the cached stack * Even better (cherry picked from commit 0771530)

(cherry picked from commit f83d9a4)

…cMC#4085) * modify effects event * give impaling fire aspect * add fabric component map builder * change interface name to match event * gametests for weird impaling enchantment * fix checkstyle issues * fabric map builder javadoc * modify effects javadoc * fix checkstyle issues * prefer extension methods over add * add enchantment source * fix missing asterisk on fabricitemstack javadoc * switch to enchantment builder * fix effects list * fix checkstyle * add note on exclusive set to javadoc * add fabric component builder extensions to default component testmod * remove threadlocal usage from mixin * remove modid prefix from accessors * remove unused import * fix recursive invoker * add test to automatically check modified item name

* New translations en_us.json (German) * New translations en_us.json (Turkish) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Polish) * New translations en_us.json (Czech) * New translations en_us.json (Japanese)

* Create `c:obsidians` * Add obsidians subtags

…4097)

…anges (FabricMC#4082) * add ItemVariant#withChanges and FluidVariant#withChanges * withChanges -> withComponentChanges * add TransferVariant#withComponentChanges * make TransferVariant#withComponentChanges throw (cherry picked from commit 1d5c243)

OroArmor · 2025-09-22T22:45:10Z

Finally finished!

Full diff: https://github.com/QuiltMC/quilted-fabric-api/pull/170/files/3b9245a97679f6c58089dd803021f93d91402b29..8e9a97b80616d923b2a9f12868d7c65001e46f02

I would recommend going commit by commit for smaller and more focused changes.

supersaiyansubtlety

incredible work
only a few notes
I'm also assuming some warnings aren't suppressed to minimize the diff (esp. deprecation)

supersaiyansubtlety · 2025-09-24T00:28:06Z

+		// TODO: Depends block
+		// this shouldn't be a huge deal because


is this still relevant?

supersaiyansubtlety · 2025-09-24T00:33:52Z

@@ -1,14 +1,21 @@
 pluginManagement {
 	repositories {
+		gradlePluginPortal()


is it important to move this before Fabric?

supersaiyansubtlety · 2025-09-24T19:22:43Z

 		Registries.init();
+
+		// .Quilt code for initializing its main entrypoint
+		setOutputStreams(); // We need to make this a bit early in case a mod uses System.out to print stuff


vanilla's setOutputStreams() call should probably be canceled

supersaiyansubtlety · 2025-09-24T19:24:56Z

+	static void invokeFreezeRegistries() { }
+
+	@Invoker
+	static <T extends Registry<?>> void invokeValidate(Registry<T> registries) { }


these should have the quilt$ prefix to avoid potential conflicts

supersaiyansubtlety · 2025-09-24T21:09:28Z

+			invokerGetter -> (server, resourceManager, success) -> {
+				invokerGetter.get().onEndDataPackReload(new org.quiltmc.qsl.resource.loader.impl.ResourceLoaderEventContextsImpl.ReloadEndContext(
+						resourceManager, server.getRegistryManager(), Optional.ofNullable(
+						success ? null : new RuntimeException("Unknown error")


Can this error message be more descriptive?

supersaiyansubtlety · 2025-09-24T22:26:43Z

 	}

+	/**
+	 * @throws UnsupportedOperationException if ran on Fabric API, which currently doesn't implement this method


Suggested change

* @throws UnsupportedOperationException if ran on Fabric API, which currently doesn't implement this method

* @throws UnsupportedOperationException if run on Fabric API, which currently doesn't implement this method

supersaiyansubtlety · 2025-09-24T22:34:27Z

+
+@Mixin(org.quiltmc.qsl.item.setting.api.RecipeRemainderLogicHandler.class)
+public interface RecipeRemainderLogicHandlerMixin {
+	@ModifyVariable(method = "getRemainder", index = 4, at = @At(value = "INVOKE", target = "Ljava/util/Set;contains(Ljava/lang/Object;)Z"))


is index = 4 necessary?
there's only one RecipeRemainderProvider
if the goal is to fail if there's ever more than one, allow = 1 could be used instead
if the goal is to use the first RecipeRemainderProvider when there's more than one, ordinal = 0 could be used instead (but I think failing is safer)

supersaiyansubtlety · 2025-09-24T22:46:55Z

-			return context.getBiomeKey().getValue().getNamespace().equals("minecraft")
-					&& BuiltInRegistryKeys.isBuiltinBiome(context.getBiomeKey());
-		};
+		return context -> org.quiltmc.qsl.worldgen.biome.api.BiomeSelectors.foundInTheEnd().test(context);


Suggested change

return context -> org.quiltmc.qsl.worldgen.biome.api.BiomeSelectors.foundInTheEnd().test(context);

return context -> org.quiltmc.qsl.worldgen.biome.api.BiomeSelectors.vanilla().test(context);

supersaiyansubtlety · 2025-09-24T22:49:42Z

+
+	@ApiStatus.Internal
+	protected org.quiltmc.qsl.worldgen.biome.api.ModificationPhase toQuilt() {
+		return this.quiltEquivalent;


would it be more maintainable to use a switch instead of a field here, like a few other enums have done?

supersaiyansubtlety · 2025-09-24T23:00:55Z

+	}
+
+	public static void initializeQuiltEventBridges(ModContainer mod) {
+		// Our events are for all screens, while Fabric's are per screen. This ensures that the Quilt events are only run for the right Fabric screen.


in the future it might be worth adding per-screen events to qsl so they needn't be implemented here

OroArmor added the upstream sync label Aug 16, 2024

OroArmor requested a review from TheGlitch76 August 16, 2024 05:18

woodiertexas reviewed Aug 16, 2024

View reviewed changes

Comment thread UPDATING.md

OroArmor force-pushed the 1.21.1 branch from 48df2a6 to 024f8b8 Compare August 16, 2024 05:22

mm12 mentioned this pull request Aug 22, 2024

[Suggestion]: Loosen minecraft version constraint Fuzss/forge-config-api-port#67

Closed

FabricMCBot and others added 4 commits August 26, 2024 12:01

Translation updates (FabricMC#4027)

9b16164

* New translations en_us.json (Korean) * New translations en_us.json (Japanese) * New translations en_us.json (German) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Italian)

Dont invoke ItemGroupEvents.MODIFY_ENTRIES_ALL for the OP tab, when t…

3fc0e55

…he OP tab is disabled (FabricMC#4045)

Bump version

f054fb5

OroArmor force-pushed the 1.21.1 branch 6 times, most recently from 8ce916b to cb8e7a2 Compare September 4, 2024 02:33

TelepathicGrunt and others added 13 commits September 10, 2024 13:15

Add c:animal_foods tag (FabricMC#4080)

3d2379b

* Add `c:animal_foods` tag * checkstyle * Spotless * Add to lang generator * Actually use the generated lang file --------- Co-authored-by: modmuss50 <modmuss50@gmail.com>

Add missing minecraft:enchantable/vanishing to c:enchantables (Fa…

4053855

…bricMC#4058)

Add TransferVariant.getComponentMap() (FabricMC#4074)

d38f898

* Add TransferVariant.getComponentMap() * used the cached stack * Even better (cherry picked from commit 0771530)

Use unix line endings on all files (FabricMC#4079)

427f7cb

(cherry picked from commit f83d9a4)

Bump version

e521378

New Crowdin updates (FabricMC#4086)

9d3173d

* New translations en_us.json (German) * New translations en_us.json (Turkish) * New translations en_us.json (Chinese Simplified) * New translations en_us.json (Polish) * New translations en_us.json (Czech) * New translations en_us.json (Japanese)

Create c:obsidians block and item tag (FabricMC#4088)

9d22c5f

* Create `c:obsidians` * Add obsidians subtags

Add access to ClientConfigurationNetworkHandler in context (FabricMC#…

c7469b2

…4097)

Fix cherry pick issues

d831205

Bump version

3b9245a

OroArmor force-pushed the 1.21.1 branch 2 times, most recently from 1ea68f5 to 0d43a80 Compare September 27, 2024 22:53

OroArmor force-pushed the 1.21.1 branch from 7aa1553 to 0a55f57 Compare September 22, 2025 21:45

OroArmor added 20 commits September 22, 2025 15:26

Quiltify the Fabric API

9176687

Add core:qsl_base

7100fad

Add core:crash_info

effa407

Add core:lifecycle_events

87ec422

Add core:networking

a2db1df

Add core:registry

66ac4cd

Add core:resource_loader

b306e85

Add block:block_content_registry

be8d022

Add block:block_entity

705af1c

Add block:block_extensions

0ffc64f

Add entity:entity_events

4f71fa3

Add entity:entity_extensions

c0889dd

Add gui:screen

5cd4791

Add gui:tooltip

94acc6e

Add item:item_content_registry

0cd96f2

Add item:item_setting

857f3b1

Add management:client_command

c451b93

Add management:command

5be9d83

Add rendering:entity_rendering

e1f960d

Add worldgen:biome

8e9a97b

OroArmor force-pushed the 1.21.1 branch from 0a55f57 to 8e9a97b Compare September 22, 2025 22:40

OroArmor marked this pull request as ready for review September 22, 2025 22:42

MrCat12-Studios approved these changes Sep 23, 2025

View reviewed changes

supersaiyansubtlety suggested changes Sep 24, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Quiltify 1.21.1#170

Quiltify 1.21.1#170
OroArmor wants to merge 37 commits into
QuiltMC:1.21.1from
OroArmorModding:1.21.1

OroArmor commented Aug 16, 2024

Uh oh!

Uh oh!

OroArmor commented Sep 22, 2025

Uh oh!

supersaiyansubtlety left a comment

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

supersaiyansubtlety Sep 24, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

		// TODO: Depends block
		// this shouldn't be a huge deal because

	* @throws UnsupportedOperationException if ran on Fabric API, which currently doesn't implement this method
	* @throws UnsupportedOperationException if run on Fabric API, which currently doesn't implement this method

	return context -> org.quiltmc.qsl.worldgen.biome.api.BiomeSelectors.foundInTheEnd().test(context);
	return context -> org.quiltmc.qsl.worldgen.biome.api.BiomeSelectors.vanilla().test(context);

Conversation

OroArmor commented Aug 16, 2024

Uh oh!

Uh oh!

OroArmor commented Sep 22, 2025

Uh oh!

supersaiyansubtlety left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants