Merge branch '26.1.2' into 26.1.2

Author: lowercasebtw

CONTRIBUTING.md

@@ -102,6 +102,36 @@ Fabric API makes strong backwards compatibility guarantees, by which contributor
 - Avoid exposing java `record`s as public API.
     - Records expose more than is necessary for most APIs, which makes them difficult to evolve.
     - Prefer to expose an interface that is implemented by an impl record.
+- Avoid creating constant interfaces or creating an interface that is never implemented and intended only to hold `static final` fields.
+    - Constant interfaces confuse users by suggesting they are intended to be implemented.
+    - This is a common Java anti-pattern.
+    - Use a utility class instead.
+    ```java
+    public final class FooEvents {
+        public static final Event<Allow> ALLOW = ...;
+        public static final Event<Before> BEFORE = ...;
+        public static final Event<After> AFTER = ...;
+    
+        @FunctionalInterface
+        public interface Allow {
+            boolean allowFoo(/* relevant parameters */);
+        }
+    
+        @FunctionalInterface
+        public interface Before {
+            void beforeFoo(/* relevant parameters */);
+        }
+    
+        @FunctionalInterface
+        public interface Two {
+            void afterFoo(/* relevant parameters */);
+        }
+    
+        // Holder class is not meant for instantiation.
+        private ExampleEvents() {
+        }
+    }
+    ```
 
 ### API design patterns to consider
 

fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/ClientGameTestContext.java

@@ -215,5 +215,5 @@ default Vector2i assertScreenshotContains(String templateImage) {
 	 * @param <E> The type of the checked exception that the function throws
 	 * @throws E When the function throws an exception
 	 */
-	<T, E extends Throwable> T computeOnClient(FailableFunction<Minecraft, T, E> function) throws E;
+	<T extends @Nullable Object, E extends Throwable> T computeOnClient(FailableFunction<Minecraft, T, E> function) throws E;
 }

fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/api/client/gametest/v1/context/TestServerContext.java

@@ -19,6 +19,7 @@
 import org.apache.commons.lang3.function.FailableConsumer;
 import org.apache.commons.lang3.function.FailableFunction;
 import org.jetbrains.annotations.ApiStatus;
+import org.jspecify.annotations.Nullable;
 
 import net.minecraft.server.MinecraftServer;
 
@@ -55,5 +56,5 @@ public interface TestServerContext {
 	 * @param <E> The type of the checked exception that the function throws
 	 * @throws E When the function throws an exception
 	 */
-	<T, E extends Throwable> T computeOnServer(FailableFunction<MinecraftServer, T, E> function) throws E;
+	<T extends @Nullable Object, E extends Throwable> T computeOnServer(FailableFunction<MinecraftServer, T, E> function) throws E;
 }

fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/impl/client/gametest/world/TestWorldBuilderImpl.java

@@ -142,5 +142,6 @@ private static void setConsistentSettings(WorldCreationUiState creator) {
 		creator.getGameRules().set(GameRules.ADVANCE_TIME, false, null);
 		creator.getGameRules().set(GameRules.ADVANCE_WEATHER, false, null);
 		creator.getGameRules().set(GameRules.SPAWN_MOBS, false, null);
+		creator.getGameRules().set(GameRules.RESPAWN_RADIUS, 0, null);
 	}
 }

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/DatagenEntrypoint.java

@@ -25,6 +25,7 @@
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.EntityTypeTagsGenerator;
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.FluidTagsGenerator;
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.ItemTagsGenerator;
+import net.fabricmc.fabric.impl.tag.convention.datagen.generators.PotionTagsGenerator;
 import net.fabricmc.fabric.impl.tag.convention.datagen.generators.StructureTagsGenerator;
 
 public class DatagenEntrypoint implements DataGeneratorEntrypoint {
@@ -36,6 +37,7 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
 		pack.addProvider((output, registriesFuture) -> new ItemTagsGenerator(output, registriesFuture, blockTags));
 		pack.addProvider(FluidTagsGenerator::new);
 		pack.addProvider(EnchantmentTagsGenerator::new);
+		pack.addProvider(PotionTagsGenerator::new);
 		pack.addProvider(BiomeTagsGenerator::new);
 		pack.addProvider(StructureTagsGenerator::new);
 		pack.addProvider(EntityTypeTagsGenerator::new);

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnchantmentTagsGenerator.java

@@ -58,5 +58,6 @@ protected void addTags(HolderLookup.Provider registries) {
 				.add(Enchantments.FIRE_PROTECTION)
 				.add(Enchantments.RESPIRATION)
 				.add(Enchantments.FEATHER_FALLING);
+		builder(ConventionalEnchantmentTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON.
 	}
 }

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java

@@ -28,6 +28,7 @@
 import net.fabricmc.fabric.api.tag.convention.v2.ConventionalEntityTypeTags;
 import net.fabricmc.fabric.api.tag.convention.v2.ConventionalFluidTags;
 import net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalPotionTags;
 import net.fabricmc.fabric.api.tag.convention.v2.ConventionalStructureTags;
 
 public class EnglishTagLangGenerator extends FabricLanguageProvider {
@@ -437,6 +438,7 @@ public void generateTranslations(HolderLookup.Provider registryLookup, Translati
 		translationBuilder.add(ConventionalEnchantmentTags.ENTITY_SPEED_ENHANCEMENTS, "Entity Speed Enhancements");
 		translationBuilder.add(ConventionalEnchantmentTags.ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS, "Entity Auxiliary Movement Enhancements");
 		translationBuilder.add(ConventionalEnchantmentTags.ENTITY_DEFENSE_ENHANCEMENTS, "Entity Defense Enhancements");
+		translationBuilder.add(ConventionalEnchantmentTags.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers");
 
 		// Entity Types
 		translationBuilder.add(ConventionalEntityTypeTags.BOSSES, "Bosses");
@@ -558,5 +560,8 @@ public void generateTranslations(HolderLookup.Provider registryLookup, Translati
 		translationBuilder.add(ConventionalBiomeTags.IS_NETHER_FOREST, "Nether Forest");
 		translationBuilder.add(ConventionalBiomeTags.IS_END, "The End");
 		translationBuilder.add(ConventionalBiomeTags.IS_OUTER_END_ISLAND, "Outer End Island");
+
+		// Potions
+		translationBuilder.add(ConventionalPotionTags.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers");
 	}
 }

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/PotionTagsGenerator.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.fabricmc.fabric.impl.tag.convention.datagen.generators;
+
+import java.util.concurrent.CompletableFuture;
+
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.item.alchemy.Potion;
+
+import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagsProvider;
+import net.fabricmc.fabric.api.tag.convention.v2.ConventionalPotionTags;
+
+public final class PotionTagsGenerator extends FabricTagsProvider<Potion> {
+	public PotionTagsGenerator(FabricPackOutput output, CompletableFuture<HolderLookup.Provider> registriesFuture) {
+		super(output, Registries.POTION, registriesFuture);
+	}
+
+	@Override
+	protected void addTags(HolderLookup.Provider registries) {
+		builder(ConventionalPotionTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON.
+	}
+}

fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json

@@ -128,6 +128,7 @@
   "tag.enchantment.c.entity_auxiliary_movement_enhancements": "Entity Auxiliary Movement Enhancements",
   "tag.enchantment.c.entity_defense_enhancements": "Entity Defense Enhancements",
   "tag.enchantment.c.entity_speed_enhancements": "Entity Speed Enhancements",
+  "tag.enchantment.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
   "tag.enchantment.c.increase_block_drops": "Increases Block Drops",
   "tag.enchantment.c.increase_entity_drops": "Increases Entity Drops",
   "tag.enchantment.c.weapon_damage_enhancements": "Weapon Damage Enhancements",
@@ -412,6 +413,7 @@
   "tag.item.c.tools.trident": "Tridents",
   "tag.item.c.tools.wrench": "Wrenches",
   "tag.item.c.villager_job_sites": "Villager Job Sites",
+  "tag.potion.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
   "tag.worldgen.biome.c.hidden_from_locator_selection": "Hidden From Locator Selection",
   "tag.worldgen.biome.c.is_aquatic": "Aquatic",
   "tag.worldgen.biome.c.is_aquatic_icy": "Icy Aquatic",

fabric-convention-tags-v2/src/generated/resources/data/c/tags/enchantment/hidden_from_recipe_viewers.json

@@ -0,0 +1,3 @@
+{
+  "values": []
+}