diff --git a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java index 5b60cb8df0..6317e035cc 100644 --- a/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java +++ b/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/impl/command/client/ClientCommandInternals.java @@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory; import net.minecraft.client.MinecraftClient; -import net.minecraft.command.CommandException; import net.minecraft.text.Text; import net.minecraft.text.Texts; @@ -96,11 +95,7 @@ public static boolean executeCommand(String command) { LOGGER.warn("Syntax exception for client-sided command '{}'", command, e); commandSource.sendError(getErrorMessage(e)); return true; - } catch (CommandException e) { - LOGGER.warn("Error while executing client-sided command '{}'", command, e); - commandSource.sendError(e.getTextMessage()); - return true; - } catch (RuntimeException e) { + } catch (Exception e) { LOGGER.warn("Error while executing client-sided command '{}'", command, e); commandSource.sendError(Text.of(e.getMessage())); return true; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java index 76cc3a67f5..007945845e 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricAdvancementProvider.java @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.gson.JsonObject; +import com.mojang.serialization.JsonOps; import net.minecraft.advancement.Advancement; import net.minecraft.advancement.AdvancementEntry; @@ -33,6 +34,7 @@ import net.minecraft.data.DataProvider; import net.minecraft.data.DataWriter; import net.minecraft.util.Identifier; +import net.minecraft.util.Util; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; @@ -85,7 +87,7 @@ public CompletableFuture run(DataWriter writer) { throw new IllegalStateException("Duplicate advancement " + advancement.id()); } - JsonObject advancementJson = advancement.value().toJson(); + JsonObject advancementJson = Util.getResult(Advancement.field_47179.encodeStart(JsonOps.INSTANCE, advancement.value()), IllegalStateException::new).getAsJsonObject(); ConditionJsonProvider.write(advancementJson, FabricDataGenHelper.consumeConditions(advancement)); futures.add(DataProvider.writeToPath(writer, advancementJson, getOutputPath(advancement))); diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java index a555864355..902b7373e5 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java @@ -24,6 +24,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.google.gson.JsonObject; +import com.mojang.serialization.JsonOps; +import org.jetbrains.annotations.Nullable; import net.minecraft.advancement.Advancement; import net.minecraft.advancement.AdvancementEntry; @@ -31,11 +33,12 @@ import net.minecraft.data.DataWriter; import net.minecraft.data.server.recipe.CraftingRecipeJsonBuilder; import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.RecipeProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.recipe.Recipe; import net.minecraft.util.Identifier; +import net.minecraft.util.Util; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; @@ -68,9 +71,9 @@ protected RecipeExporter withConditions(RecipeExporter exporter, ConditionJsonPr Preconditions.checkArgument(conditions.length > 0, "Must add at least one condition."); return new RecipeExporter() { @Override - public void accept(RecipeJsonProvider provider) { - FabricDataGenHelper.addConditions(provider, conditions); - exporter.accept(provider); + public void accept(Identifier identifier, Recipe recipe, @Nullable AdvancementEntry advancementEntry) { + FabricDataGenHelper.addConditions(recipe, conditions); + exporter.accept(identifier, recipe, advancementEntry); } @Override @@ -86,23 +89,21 @@ public CompletableFuture run(DataWriter writer) { List> list = new ArrayList<>(); generate(new RecipeExporter() { @Override - public void accept(RecipeJsonProvider provider) { - Identifier identifier = getRecipeIdentifier(provider.id()); + public void accept(Identifier recipeId, Recipe recipe, @Nullable AdvancementEntry advancement) { + Identifier identifier = getRecipeIdentifier(recipeId); if (!generatedRecipes.add(identifier)) { throw new IllegalStateException("Duplicate recipe " + identifier); } - JsonObject recipeJson = provider.toJson(); - ConditionJsonProvider[] conditions = FabricDataGenHelper.consumeConditions(provider); + JsonObject recipeJson = Util.getResult(Recipe.field_47319.encodeStart(JsonOps.INSTANCE, recipe), IllegalStateException::new).getAsJsonObject(); + ConditionJsonProvider[] conditions = FabricDataGenHelper.consumeConditions(recipe); ConditionJsonProvider.write(recipeJson, conditions); list.add(DataProvider.writeToPath(writer, recipeJson, recipesPathResolver.resolveJson(identifier))); - AdvancementEntry advancement = provider.advancement(); - if (advancement != null) { - JsonObject advancementJson = advancement.value().toJson(); + JsonObject advancementJson = Util.getResult(Advancement.field_47179.encodeStart(JsonOps.INSTANCE, advancement.value()), IllegalStateException::new).getAsJsonObject(); ConditionJsonProvider.write(advancementJson, conditions); list.add(DataProvider.writeToPath(writer, advancementJson, advancementsPathResolver.resolveJson(getRecipeIdentifier(advancement.id())))); } diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener index 79c082a2a7..acbf52e266 100644 --- a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener +++ b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener @@ -71,7 +71,7 @@ transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider off transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerShapelessRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;I)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerSmelting (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerBlasting (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerMultipleOptions (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/RecipeSerializer;Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerMultipleOptions (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;Ljava/lang/String;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerNetheriteUpgradeRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/Item;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/Item;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerSmithingTrimRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offer2x2CompactingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V @@ -122,8 +122,8 @@ transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider off transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerReversibleCompactingRecipes (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerSmithingTemplateCopyingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/registry/tag/TagKey;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerSmithingTemplateCopyingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider generateCookingRecipes (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;I)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerFoodCookingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;ILnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;F)V +transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider generateCookingRecipes (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;I)V +transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerFoodCookingRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;ILnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;F)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerWaxingRecipes (Lnet/minecraft/data/server/recipe/RecipeExporter;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerGrateRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V transitive-accessible method net/minecraft/data/server/recipe/RecipeProvider offerBulbRecipe (Lnet/minecraft/data/server/recipe/RecipeExporter;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V @@ -256,7 +256,7 @@ transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPlantPart (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$TintType;)V transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerBed (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRoots (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator addJigsawOrientationToVariant (Lnet/minecraft/block/enums/JigsawOrientation;Lnet/minecraft/data/client/BlockStateVariant;)Lnet/minecraft/data/client/BlockStateVariant; +transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator addJigsawOrientationToVariant (Lnet/minecraft/block/enums/Orientation;Lnet/minecraft/data/client/BlockStateVariant;)Lnet/minecraft/data/client/BlockStateVariant; transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCandle (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator applyExplosionDecay (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/function/LootFunctionConsumingBuilder;)Lnet/minecraft/loot/function/LootFunctionConsumingBuilder; transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addSurvivesExplosionCondition (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/condition/LootConditionConsumingBuilder;)Lnet/minecraft/loot/condition/LootConditionConsumingBuilder; diff --git a/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/FabricDimensionTest.java b/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/FabricDimensionTest.java index d7c75d776e..10f16e81b1 100644 --- a/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/FabricDimensionTest.java +++ b/fabric-dimensions-v1/src/testmod/java/net/fabricmc/fabric/test/dimension/FabricDimensionTest.java @@ -24,7 +24,6 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import net.minecraft.block.Blocks; -import net.minecraft.command.CommandException; import net.minecraft.command.argument.DimensionArgumentType; import net.minecraft.entity.Entity; import net.minecraft.registry.Registries; @@ -127,7 +126,7 @@ private int swapTargeted(CommandContext context) { FabricDimensions.teleport(player, modWorld, target); if (player.getWorld() != modWorld) { - throw new CommandException(Text.literal("Teleportation failed!")); + throw new RuntimeException("Teleportation failed!"); } modWorld.setBlockState(new BlockPos(0, 100, 0), Blocks.DIAMOND_BLOCK.getDefaultState()); diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeBuilder.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeBuilder.java index 4f9d95cd05..37efe77b32 100644 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeBuilder.java +++ b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeBuilder.java @@ -31,6 +31,7 @@ */ public final class BlockSetTypeBuilder { private boolean openableByHand = true; + private boolean openableByWindCharge = true; private boolean buttonActivatedByArrows = true; private BlockSetType.ActivationRule pressurePlateActivationRule = BlockSetType.ActivationRule.EVERYTHING; private BlockSoundGroup soundGroup = BlockSoundGroup.WOOD; @@ -55,6 +56,18 @@ public BlockSetTypeBuilder openableByHand(boolean openableByHand) { return this; } + /** + * Sets whether this block set type's door and trapdoor can be opened by wind charge. + * + *

Defaults to {@code true}. + * + * @return this builder for chaining + */ + public BlockSetTypeBuilder openableByWindCharge(boolean openableByWindCharge) { + this.openableByWindCharge = openableByWindCharge; + return this; + } + /** * Sets whether this block set type's button can be activated by an arrow. * @@ -260,6 +273,6 @@ public BlockSetType register(Identifier id) { * @return the built {@link BlockSetType} */ public BlockSetType build(Identifier id) { - return new BlockSetType(id.toString(), openableByHand, buttonActivatedByArrows, pressurePlateActivationRule, soundGroup, doorCloseSound, doorOpenSound, trapdoorCloseSound, trapdoorOpenSound, pressurePlateClickOffSound, pressurePlateClickOnSound, buttonClickOffSound, buttonClickOnSound); + return new BlockSetType(id.toString(), openableByHand, openableByWindCharge, buttonActivatedByArrows, pressurePlateActivationRule, soundGroup, doorCloseSound, doorOpenSound, trapdoorCloseSound, trapdoorOpenSound, pressurePlateClickOffSound, pressurePlateClickOnSound, buttonClickOffSound, buttonClickOnSound); } } diff --git a/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java b/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java index cd83b91d4b..3f4cdce283 100644 --- a/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java +++ b/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/SerializationTests.java @@ -19,6 +19,7 @@ import java.util.List; import com.google.gson.JsonElement; +import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.google.gson.JsonParser; import com.mojang.serialization.Codec; @@ -77,10 +78,10 @@ public void testCustomIngredientSerialization(TestContext context) { Ingredient ingredient = DefaultCustomIngredients.all( Ingredient.ofItems(Items.STONE) ); - JsonElement json = ingredient.toJson(allowEmpty); + Codec ingredientCodec = allowEmpty ? Ingredient.ALLOW_EMPTY_CODEC : Ingredient.DISALLOW_EMPTY_CODEC; + JsonObject json = Util.getResult(ingredientCodec.encodeStart(JsonOps.INSTANCE, ingredient), IllegalStateException::new).getAsJsonObject(); context.assertTrue(json.toString().equals(ingredientJson), "Unexpected json: " + json); // Make sure that we can deserialize it - Codec ingredientCodec = allowEmpty ? Ingredient.ALLOW_EMPTY_CODEC : Ingredient.DISALLOW_EMPTY_CODEC; Ingredient deserialized = Util.getResult( ingredientCodec.parse(JsonOps.INSTANCE, json), JsonParseException::new ); diff --git a/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener b/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener index f8284199ec..442cc8914a 100644 --- a/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener +++ b/fabric-transitive-access-wideners-v1/src/main/resources/fabric-transitive-access-wideners-v1.accesswidener @@ -46,10 +46,6 @@ transitive-accessible method net/minecraft/entity/SpawnRestriction register (Lne transitive-accessible method net/minecraft/item/ItemUsageContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V transitive-accessible method net/minecraft/item/ItemPlacementContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V -# Recipe factories -transitive-accessible class net/minecraft/recipe/CookingRecipeSerializer$RecipeFactory -transitive-accessible class net/minecraft/recipe/CuttingRecipe$Serializer$RecipeFactory - # Registering custom brewing recipes transitive-accessible method net/minecraft/recipe/BrewingRecipeRegistry registerItemRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;)V transitive-accessible method net/minecraft/recipe/BrewingRecipeRegistry registerPotionType (Lnet/minecraft/item/Item;)V @@ -130,7 +126,6 @@ transitive-accessible method net/minecraft/entity/damage/DamageSources create (L transitive-accessible field net/minecraft/client/MinecraftClient attackCooldown I # Creating certain types of blocks -transitive-accessible method net/minecraft/block/Blocks createBambooBlock (Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/Block; transitive-accessible method net/minecraft/block/Blocks createFlowerPotBlock (Lnet/minecraft/block/Block;)Lnet/minecraft/block/Block; transitive-accessible method net/minecraft/block/Blocks createLeavesBlock (Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/Block; transitive-accessible method net/minecraft/block/Blocks createLogBlock (Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block; @@ -314,6 +309,7 @@ transitive-accessible field net/minecraft/client/render/RenderPhase GUI_PROGRAM transitive-accessible field net/minecraft/client/render/RenderPhase GUI_OVERLAY_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram; transitive-accessible field net/minecraft/client/render/RenderPhase GUI_TEXT_HIGHLIGHT_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram; transitive-accessible field net/minecraft/client/render/RenderPhase GUI_GHOST_RECIPE_OVERLAY_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram; +transitive-accessible field net/minecraft/client/render/RenderPhase field_47463 Lnet/minecraft/client/render/RenderPhase$ShaderProgram; transitive-accessible field net/minecraft/client/render/RenderPhase MIPMAP_BLOCK_ATLAS_TEXTURE Lnet/minecraft/client/render/RenderPhase$Texture; transitive-accessible field net/minecraft/client/render/RenderPhase BLOCK_ATLAS_TEXTURE Lnet/minecraft/client/render/RenderPhase$Texture; transitive-accessible field net/minecraft/client/render/RenderPhase NO_TEXTURE Lnet/minecraft/client/render/RenderPhase$TextureBase; diff --git a/fabric-transitive-access-wideners-v1/template.accesswidener b/fabric-transitive-access-wideners-v1/template.accesswidener index 85cf2e46cf..65815c9453 100644 --- a/fabric-transitive-access-wideners-v1/template.accesswidener +++ b/fabric-transitive-access-wideners-v1/template.accesswidener @@ -41,10 +41,6 @@ transitive-accessible method net/minecraft/entity/SpawnRestriction register (Lne transitive-accessible method net/minecraft/item/ItemUsageContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V transitive-accessible method net/minecraft/item/ItemPlacementContext (Lnet/minecraft/world/World;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/Hand;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/hit/BlockHitResult;)V -# Recipe factories -transitive-accessible class net/minecraft/recipe/CookingRecipeSerializer$RecipeFactory -transitive-accessible class net/minecraft/recipe/CuttingRecipe$Serializer$RecipeFactory - # Registering custom brewing recipes transitive-accessible method net/minecraft/recipe/BrewingRecipeRegistry registerItemRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;)V transitive-accessible method net/minecraft/recipe/BrewingRecipeRegistry registerPotionType (Lnet/minecraft/item/Item;)V @@ -125,7 +121,6 @@ transitive-accessible method net/minecraft/entity/damage/DamageSources create (L transitive-accessible field net/minecraft/client/MinecraftClient attackCooldown I # Creating certain types of blocks -transitive-accessible method net/minecraft/block/Blocks createBambooBlock (Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/Block; transitive-accessible method net/minecraft/block/Blocks createFlowerPotBlock (Lnet/minecraft/block/Block;)Lnet/minecraft/block/Block; transitive-accessible method net/minecraft/block/Blocks createLeavesBlock (Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/Block; transitive-accessible method net/minecraft/block/Blocks createLogBlock (Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block; diff --git a/gradle.properties b/gradle.properties index a9816adad1..25e25edff3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ org.gradle.jvmargs=-Xmx2560M org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true -version=0.90.7 -minecraft_version=23w44a +version=0.90.8 +minecraft_version=23w45a yarn_version=+build.1 loader_version=0.14.23 installer_version=0.11.1 @@ -18,14 +18,14 @@ fabric-biome-api-v1-version=13.0.14 fabric-block-api-v1-version=1.0.13 fabric-block-view-api-v2-version=1.0.2 fabric-blockrenderlayer-v1-version=1.1.44 -fabric-command-api-v1-version=1.2.38 -fabric-command-api-v2-version=2.2.17 -fabric-commands-v0-version=0.2.55 +fabric-command-api-v1-version=1.2.39 +fabric-command-api-v2-version=2.2.18 +fabric-commands-v0-version=0.2.56 fabric-containers-v0-version=0.1.76 fabric-content-registries-v0-version=5.0.8 fabric-crash-report-info-v1-version=0.2.21 -fabric-data-generation-api-v1-version=13.1.9 -fabric-dimensions-v1-version=2.1.57 +fabric-data-generation-api-v1-version=13.1.10 +fabric-dimensions-v1-version=2.1.58 fabric-entity-events-v1-version=1.5.26 fabric-events-interaction-v0-version=0.6.13 fabric-events-lifecycle-v0-version=0.2.70 @@ -42,9 +42,9 @@ fabric-mining-level-api-v1-version=2.1.58 fabric-model-loading-api-v1-version=1.0.6 fabric-models-v0-version=0.4.5 fabric-networking-api-v1-version=3.0.12 -fabric-object-builder-api-v1-version=13.0.4 +fabric-object-builder-api-v1-version=13.0.5 fabric-particles-v1-version=1.1.5 -fabric-recipe-api-v1-version=2.0.9 +fabric-recipe-api-v1-version=2.0.10 fabric-registry-sync-v0-version=4.0.8 fabric-renderer-api-v1-version=3.2.2 fabric-renderer-indigo-version=1.5.2 @@ -59,6 +59,6 @@ fabric-screen-api-v1-version=2.0.14 fabric-screen-handler-api-v1-version=1.3.45 fabric-sound-api-v1-version=1.0.15 fabric-transfer-api-v1-version=4.0.3 -fabric-transitive-access-wideners-v1-version=5.0.9 +fabric-transitive-access-wideners-v1-version=5.0.10 fabric-convention-tags-v1-version=1.5.8 fabric-client-tags-api-v1-version=1.1.5