From 10292b95f5cf916170c0ac97c7d239dc1ef9e7bf Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 5 Oct 2023 09:45:32 +0100 Subject: [PATCH] 23w40a --- .../fabric/test/lookup/ChuteBlock.java | 6 ++ .../fabric/test/lookup/CobbleGenBlock.java | 6 ++ .../ServerPlayerInteractionManagerMixin.java | 6 +- .../v1/block/type/BlockSetTypeBuilder.java | 32 ++++++++- .../v1/block/type/BlockSetTypeRegistry.java | 66 ------------------- .../v1/block/type/WoodTypeRegistry.java | 66 ------------------- .../test/object/builder/TealSignTest.java | 8 +-- .../mixin/registry/sync/IdListMixin.java | 4 +- .../registry/sync/SimpleRegistryMixin.java | 3 +- .../test/screenhandler/block/BoxBlock.java | 7 ++ ...ransitive-access-wideners-v1.accesswidener | 44 +++++-------- .../test/access/SignBlockEntityTest.java | 4 +- .../template.accesswidener | 12 ++-- gradle.properties | 28 ++++---- src/main/resources/fabric.mod.json | 4 +- 15 files changed, 103 insertions(+), 193 deletions(-) delete mode 100644 fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeRegistry.java delete mode 100644 fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/WoodTypeRegistry.java diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java index c1c1b5b190..59fcf78fb3 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/ChuteBlock.java @@ -16,6 +16,7 @@ package net.fabricmc.fabric.test.lookup; +import com.mojang.serialization.MapCodec; import org.jetbrains.annotations.Nullable; import net.minecraft.block.BlockState; @@ -31,6 +32,11 @@ public ChuteBlock(Settings settings) { super(settings); } + @Override + protected MapCodec method_53969() { + throw new UnsupportedOperationException("not implemented yet"); + } + @Nullable @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { diff --git a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java index c19701a494..ccef593d05 100644 --- a/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java +++ b/fabric-api-lookup-api-v1/src/testmod/java/net/fabricmc/fabric/test/lookup/CobbleGenBlock.java @@ -16,6 +16,7 @@ package net.fabricmc.fabric.test.lookup; +import com.mojang.serialization.MapCodec; import org.jetbrains.annotations.Nullable; import net.minecraft.block.BlockState; @@ -28,6 +29,11 @@ public CobbleGenBlock(Settings settings) { super(settings); } + @Override + protected MapCodec method_53969() { + throw new UnsupportedOperationException("not implemented yet"); + } + @Nullable @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java index 7da11eb49d..dfda6c4138 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerInteractionManagerMixin.java @@ -104,8 +104,8 @@ public void interactItem(ServerPlayerEntity player, World world, ItemStack stack } } - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V"), method = "tryBreakBlock", locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true) - private void breakBlock(BlockPos pos, CallbackInfoReturnable cir, BlockState state, BlockEntity entity, Block block) { + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/block/BlockState;"), method = "tryBreakBlock", locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true) + private void breakBlock(BlockPos pos, CallbackInfoReturnable cir, BlockEntity entity, Block block, BlockState state) { boolean result = PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak(this.world, this.player, pos, state, entity); if (!result) { @@ -116,7 +116,7 @@ private void breakBlock(BlockPos pos, CallbackInfoReturnable cir, Block } @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBroken(Lnet/minecraft/world/WorldAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;)V"), method = "tryBreakBlock", locals = LocalCapture.CAPTURE_FAILHARD) - private void onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, BlockState state, BlockEntity entity, Block block, boolean b1) { + private void onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, BlockEntity entity, Block block, BlockState state, boolean bl) { PlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(this.world, this.player, pos, state, entity); } } 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 04a60465b0..4f9d95cd05 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,8 @@ */ public final class BlockSetTypeBuilder { private boolean openableByHand = true; + private boolean buttonActivatedByArrows = true; + private BlockSetType.ActivationRule pressurePlateActivationRule = BlockSetType.ActivationRule.EVERYTHING; private BlockSoundGroup soundGroup = BlockSoundGroup.WOOD; private SoundEvent doorCloseSound = SoundEvents.BLOCK_WOODEN_DOOR_CLOSE; private SoundEvent doorOpenSound = SoundEvents.BLOCK_WOODEN_DOOR_OPEN; @@ -53,6 +55,30 @@ public BlockSetTypeBuilder openableByHand(boolean openableByHand) { return this; } + /** + * Sets whether this block set type's button can be activated by an arrow. + * + *

Defaults to {@code true}. + * + * @return this builder for chaining + */ + public BlockSetTypeBuilder buttonActivatedByArrows(boolean buttonActivatedByArrows) { + this.buttonActivatedByArrows = buttonActivatedByArrows; + return this; + } + + /** + * Sets this block set type's pressure plate {@link BlockSetType.ActivationRule}. + * + *

Defaults to {@link BlockSetType.ActivationRule#EVERYTHING}. + * + * @return this builder for chaining + */ + public BlockSetTypeBuilder pressurePlateActivationRule(BlockSetType.ActivationRule activationRule) { + this.pressurePlateActivationRule = activationRule; + return this; + } + /** * Sets this block set type's sound group. * @@ -171,6 +197,8 @@ public BlockSetTypeBuilder buttonClickOnSound(SoundEvent buttonClickOnSound) { public static BlockSetTypeBuilder copyOf(BlockSetTypeBuilder builder) { BlockSetTypeBuilder copy = new BlockSetTypeBuilder(); copy.openableByHand(builder.openableByHand); + copy.buttonActivatedByArrows(builder.buttonActivatedByArrows); + copy.pressurePlateActivationRule(builder.pressurePlateActivationRule); copy.soundGroup(builder.soundGroup); copy.doorCloseSound(builder.doorCloseSound); copy.doorOpenSound(builder.doorOpenSound); @@ -193,6 +221,8 @@ public static BlockSetTypeBuilder copyOf(BlockSetTypeBuilder builder) { public static BlockSetTypeBuilder copyOf(BlockSetType setType) { BlockSetTypeBuilder copy = new BlockSetTypeBuilder(); copy.openableByHand(setType.canOpenByHand()); + copy.buttonActivatedByArrows(setType.canButtonBeActivatedByArrows()); + copy.pressurePlateActivationRule(setType.pressurePlateSensitivity()); copy.soundGroup(setType.soundType()); copy.doorCloseSound(setType.doorClose()); copy.doorOpenSound(setType.doorOpen()); @@ -230,6 +260,6 @@ public BlockSetType register(Identifier id) { * @return the built {@link BlockSetType} */ public BlockSetType build(Identifier id) { - return new BlockSetType(id.toString(), openableByHand, soundGroup, doorCloseSound, doorOpenSound, trapdoorCloseSound, trapdoorOpenSound, pressurePlateClickOffSound, pressurePlateClickOnSound, buttonClickOffSound, buttonClickOnSound); + return new BlockSetType(id.toString(), openableByHand, buttonActivatedByArrows, pressurePlateActivationRule, soundGroup, doorCloseSound, doorOpenSound, trapdoorCloseSound, trapdoorOpenSound, pressurePlateClickOffSound, pressurePlateClickOnSound, buttonClickOffSound, buttonClickOnSound); } } diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeRegistry.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeRegistry.java deleted file mode 100644 index 8b7febedec..0000000000 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/BlockSetTypeRegistry.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.api.object.builder.v1.block.type; - -import net.minecraft.block.BlockSetType; -import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; - -/** - * This class allows registering {@link BlockSetType}s. - * - *

A {@link BlockSetType} is used to tell the game what sounds various related blocks should use. - * - * @see WoodTypeRegistry - * @deprecated use {@link BlockSetTypeBuilder} - */ -@Deprecated -public final class BlockSetTypeRegistry { - private BlockSetTypeRegistry() { - } - - /** - * Creates and registers a {@link BlockSetType} with the regular wood sounds. - * - * @param id the id of this {@link BlockSetType} - * @return a new {@link BlockSetType} - */ - public static BlockSetType registerWood(Identifier id) { - return BlockSetType.register(new BlockSetType(id.toString())); - } - - /** - * Creates and registers a {@link BlockSetType}. - * - * @param id the id of this {@link BlockSetType} - * @param canOpenByHand set to true to allow this block set's door's to be opened by hand - * @param soundType the {@link BlockSoundGroup} for this block set - * @param doorClose the {@link SoundEvent} for when this block set's door closes - * @param doorOpen the {@link SoundEvent} for when this block set's door opens - * @param trapdoorClose the {@link SoundEvent} for when this block set's trapdoor closes - * @param trapdoorOpen the {@link SoundEvent} for when this block set's trapdoor opens - * @param pressurePlateClickOff the {@link SoundEvent} for when this block set's pressure plate is unpressed - * @param pressurePlateClickOn the {@link SoundEvent} for when this block set's pressure plate is pressed - * @param buttonClickOff the {@link SoundEvent} for when this block set's button is unpressed - * @param buttonClickOn the {@link SoundEvent} for when this block set's button is pressed - * @return a new {@link BlockSetType} - */ - public static BlockSetType register(Identifier id, boolean canOpenByHand, BlockSoundGroup soundType, SoundEvent doorClose, SoundEvent doorOpen, SoundEvent trapdoorClose, SoundEvent trapdoorOpen, SoundEvent pressurePlateClickOff, SoundEvent pressurePlateClickOn, SoundEvent buttonClickOff, SoundEvent buttonClickOn) { - return BlockSetType.register(new BlockSetType(id.toString(), canOpenByHand, soundType, doorClose, doorOpen, trapdoorClose, trapdoorOpen, pressurePlateClickOff, pressurePlateClickOn, buttonClickOff, buttonClickOn)); - } -} diff --git a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/WoodTypeRegistry.java b/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/WoodTypeRegistry.java deleted file mode 100644 index 9a3a3a646e..0000000000 --- a/fabric-object-builder-api-v1/src/main/java/net/fabricmc/fabric/api/object/builder/v1/block/type/WoodTypeRegistry.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.api.object.builder.v1.block.type; - -import net.minecraft.block.BlockSetType; -import net.minecraft.block.WoodType; -import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; - -/** - * This class allows registering {@link WoodType}s. - * - *

A {@link WoodType} is used to tell the game what textures signs should use, as well as sounds for both signs and fence gates. - * - *

Regular sign textures are stored at {@code [namespace]/textures/entity/signs/[path].png}. - *
Hanging sign textures are stored at {@code [namespace]/textures/entity/signs/hanging/[path].png}. - * - * @see BlockSetTypeRegistry - * @deprecated use {@link WoodTypeBuilder} - */ -@Deprecated -public final class WoodTypeRegistry { - private WoodTypeRegistry() { - } - - /** - * Creates and registers a {@link WoodType}. - * - * @param id the id of this {@link WoodType} - * @param setType the {@link BlockSetType} for this wood type - * @return a new {@link WoodType} - */ - public static WoodType register(Identifier id, BlockSetType setType) { - return WoodType.register(new WoodType(id.toString(), setType)); - } - - /** - * Creates and registers a {@link WoodType}. - * - * @param id the id of this {@link WoodType} - * @param setType the {@link BlockSetType} for this wood type - * @param soundType the {@link BlockSoundGroup} for this wood type - * @param hangingSignSoundType the {@link BlockSoundGroup} for this wood type's hanging sign - * @param fenceGateClose the {@link SoundEvent} for when this wood type's fence gate closes - * @param fenceGateOpen the {@link SoundEvent} for when this wood type's fence gate opens - * @return a new {@link WoodType} - */ - public static WoodType register(Identifier id, BlockSetType setType, BlockSoundGroup soundType, BlockSoundGroup hangingSignSoundType, SoundEvent fenceGateClose, SoundEvent fenceGateOpen) { - return WoodType.register(new WoodType(id.toString(), setType, soundType, hangingSignSoundType, fenceGateClose, fenceGateOpen)); - } -} diff --git a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java index 066eee224d..a6b0a6800a 100644 --- a/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java +++ b/fabric-object-builder-api-v1/src/testmod/java/net/fabricmc/fabric/test/object/builder/TealSignTest.java @@ -45,25 +45,25 @@ public class TealSignTest implements ModInitializer { public static final Identifier TEAL_TYPE_ID = ObjectBuilderTestConstants.id("teal"); public static final BlockSetType TEAL_BLOCK_SET_TYPE = BlockSetTypeBuilder.copyOf(BlockSetType.OAK).build(TEAL_TYPE_ID); public static final WoodType TEAL_WOOD_TYPE = WoodTypeBuilder.copyOf(WoodType.OAK).build(TEAL_TYPE_ID, TEAL_BLOCK_SET_TYPE); - public static final SignBlock TEAL_SIGN = new SignBlock(FabricBlockSettings.copy(Blocks.OAK_SIGN), TEAL_WOOD_TYPE) { + public static final SignBlock TEAL_SIGN = new SignBlock(TEAL_WOOD_TYPE, FabricBlockSettings.copy(Blocks.OAK_SIGN)) { @Override public TealSign createBlockEntity(BlockPos pos, BlockState state) { return new TealSign(pos, state); } }; - public static final WallSignBlock TEAL_WALL_SIGN = new WallSignBlock(FabricBlockSettings.copy(Blocks.OAK_SIGN), TEAL_WOOD_TYPE) { + public static final WallSignBlock TEAL_WALL_SIGN = new WallSignBlock(TEAL_WOOD_TYPE, FabricBlockSettings.copy(Blocks.OAK_SIGN)) { @Override public TealSign createBlockEntity(BlockPos pos, BlockState state) { return new TealSign(pos, state); } }; - public static final HangingSignBlock TEAL_HANGING_SIGN = new HangingSignBlock(FabricBlockSettings.copy(Blocks.OAK_HANGING_SIGN), TEAL_WOOD_TYPE) { + public static final HangingSignBlock TEAL_HANGING_SIGN = new HangingSignBlock(TEAL_WOOD_TYPE, FabricBlockSettings.copy(Blocks.OAK_HANGING_SIGN)) { @Override public TealHangingSign createBlockEntity(BlockPos pos, BlockState state) { return new TealHangingSign(pos, state); } }; - public static final WallHangingSignBlock TEAL_WALL_HANGING_SIGN = new WallHangingSignBlock(FabricBlockSettings.copy(Blocks.OAK_HANGING_SIGN), TEAL_WOOD_TYPE) { + public static final WallHangingSignBlock TEAL_WALL_HANGING_SIGN = new WallHangingSignBlock(TEAL_WOOD_TYPE, FabricBlockSettings.copy(Blocks.OAK_HANGING_SIGN)) { @Override public TealHangingSign createBlockEntity(BlockPos pos, BlockState state) { return new TealHangingSign(pos, state); diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/IdListMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/IdListMixin.java index bfa5be4ecb..c7fa41a20d 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/IdListMixin.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/IdListMixin.java @@ -21,7 +21,7 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntMaps; -import it.unimi.dsi.fastutil.objects.Object2IntMap; +import it.unimi.dsi.fastutil.objects.Reference2IntMap; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -37,7 +37,7 @@ public class IdListMixin implements RemovableIdList { private int nextId; @Final @Shadow - private Object2IntMap idMap; + private Reference2IntMap idMap; @Final @Shadow private List list; diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java index 1e0f0bbad5..7dbee5965a 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/SimpleRegistryMixin.java @@ -33,6 +33,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectList; +import it.unimi.dsi.fastutil.objects.Reference2IntMap; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,7 +77,7 @@ public abstract class SimpleRegistryMixin implements MutableRegistry, Rema private ObjectList> rawIdToEntry; @Shadow @Final - private Object2IntMap entryToRawId; + private Reference2IntMap entryToRawId; @Shadow @Final private Map> idToEntry; diff --git a/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/block/BoxBlock.java b/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/block/BoxBlock.java index e7a9a143ab..73963bfdb4 100644 --- a/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/block/BoxBlock.java +++ b/fabric-screen-handler-api-v1/src/testmod/java/net/fabricmc/fabric/test/screenhandler/block/BoxBlock.java @@ -16,6 +16,8 @@ package net.fabricmc.fabric.test.screenhandler.block; +import com.mojang.serialization.MapCodec; + import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; @@ -36,6 +38,11 @@ public BoxBlock(Settings settings) { super(settings); } + @Override + protected MapCodec method_53969() { + throw new UnsupportedOperationException("not implemented yet"); + } + @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (!world.isClient) { 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 df0f4a66ec..a8cb35ba21 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 @@ -130,13 +130,13 @@ 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/PillarBlock; -transitive-accessible method net/minecraft/block/Blocks createFlowerPotBlock (Lnet/minecraft/block/Block;[Lnet/minecraft/resource/featuretoggle/FeatureFlag;)Lnet/minecraft/block/FlowerPotBlock; -transitive-accessible method net/minecraft/block/Blocks createLeavesBlock (Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/LeavesBlock; -transitive-accessible method net/minecraft/block/Blocks createLogBlock (Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/PillarBlock; +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; transitive-accessible method net/minecraft/block/Blocks createNetherStemBlock (Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block; -transitive-accessible method net/minecraft/block/Blocks createStoneButtonBlock ()Lnet/minecraft/block/ButtonBlock; -transitive-accessible method net/minecraft/block/Blocks createWoodenButtonBlock (Lnet/minecraft/block/BlockSetType;[Lnet/minecraft/resource/featuretoggle/FeatureFlag;)Lnet/minecraft/block/ButtonBlock; +transitive-accessible method net/minecraft/block/Blocks createStoneButtonBlock ()Lnet/minecraft/block/Block; +transitive-accessible method net/minecraft/block/Blocks createWoodenButtonBlock (Lnet/minecraft/block/BlockSetType;)Lnet/minecraft/block/Block; # Methods used in block creation transitive-accessible method net/minecraft/block/Blocks always (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Z @@ -148,26 +148,23 @@ transitive-accessible method net/minecraft/block/Blocks never (Lnet/minecraft/bl ### Generated access wideners below # Constructors of non-abstract block classes -transitive-accessible method net/minecraft/block/AirBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/AttachedStemBlock (Lnet/minecraft/block/GourdBlock;Ljava/util/function/Supplier;Lnet/minecraft/block/AbstractBlock$Settings;)V +transitive-accessible method net/minecraft/block/AttachedStemBlock (Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/AzaleaBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/BarrierBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/BigDripleafBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/BigDripleafStemBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/BlastFurnaceBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/ButtonBlock (Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/BlockSetType;IZ)V +transitive-accessible method net/minecraft/block/ButtonBlock (Lnet/minecraft/block/BlockSetType;ILnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CactusBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CakeBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CandleCakeBlock (Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CartographyTableBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CarvedPumpkinBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/ChestBlock (Lnet/minecraft/block/AbstractBlock$Settings;Ljava/util/function/Supplier;)V -transitive-accessible method net/minecraft/block/ChorusFlowerBlock (Lnet/minecraft/block/ChorusPlantBlock;Lnet/minecraft/block/AbstractBlock$Settings;)V +transitive-accessible method net/minecraft/block/ChorusFlowerBlock (Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/ChorusPlantBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/ConnectingBlock (FLnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CoralBlock (Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CoralFanBlock (Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/CoralParentBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CoralWallFanBlock (Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CraftingTableBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/CropBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V @@ -178,7 +175,7 @@ transitive-accessible method net/minecraft/block/DeadCoralWallFanBlock (L transitive-accessible method net/minecraft/block/DecoratedPotBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/DirtPathBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/DispenserBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/DoorBlock (Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/BlockSetType;)V +transitive-accessible method net/minecraft/block/DoorBlock (Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/DyedCarpetBlock (Lnet/minecraft/util/DyeColor;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/EnchantingTableBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/EndGatewayBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V @@ -190,11 +187,10 @@ transitive-accessible method net/minecraft/block/FernBlock (Lnet/minecraf transitive-accessible method net/minecraft/block/FletchingTableBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/FlowerbedBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/FluidBlock (Lnet/minecraft/fluid/FlowableFluid;Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/FungusBlock (Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/block/FungusBlock (Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/Block;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/FurnaceBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/GrindstoneBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/HangingRootsBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/HorizontalConnectingBlock (FFFFFLnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/JigsawBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/JukeboxBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/KelpBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V @@ -205,21 +201,18 @@ transitive-accessible method net/minecraft/block/LeverBlock (Lnet/minecra transitive-accessible method net/minecraft/block/LilyPadBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/LoomBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/MangroveRootsBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/MelonBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/NetherWartBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/NyliumBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/PaneBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/PlantBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/PlayerSkullBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/PoweredRailBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/PressurePlateBlock (Lnet/minecraft/block/PressurePlateBlock$ActivationRule;Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/BlockSetType;)V +transitive-accessible method net/minecraft/block/PressurePlateBlock (Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/PumpkinBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/RailBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/RedstoneTorchBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/RepeaterBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/RodBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/RootsBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/SaplingBlock (Lnet/minecraft/block/sapling/SaplingGenerator;Lnet/minecraft/block/AbstractBlock$Settings;)V +transitive-accessible method net/minecraft/block/SaplingBlock (Lnet/minecraft/class_8813;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/ScaffoldingBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/SeaPickleBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/SeagrassBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V @@ -231,21 +224,20 @@ transitive-accessible method net/minecraft/block/SnowyBlock (Lnet/minecra transitive-accessible method net/minecraft/block/SpawnerBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/SpongeBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/StairsBlock (Lnet/minecraft/block/BlockState;Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/StemBlock (Lnet/minecraft/block/GourdBlock;Ljava/util/function/Supplier;Lnet/minecraft/block/AbstractBlock$Settings;)V +transitive-accessible method net/minecraft/block/StemBlock (Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/StructureBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/StructureVoidBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/SugarCaneBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/TorchBlock (Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/particle/ParticleEffect;)V +transitive-accessible method net/minecraft/block/TorchBlock (Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/TransparentBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/TrapdoorBlock (Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/BlockSetType;)V -transitive-accessible method net/minecraft/block/WallMountedBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V +transitive-accessible method net/minecraft/block/TrapdoorBlock (Lnet/minecraft/block/BlockSetType;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/WallPlayerSkullBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/WallRedstoneTorchBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/WallSkullBlock (Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/WallTorchBlock (Lnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/particle/ParticleEffect;)V +transitive-accessible method net/minecraft/block/WallTorchBlock (Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/WallWitherSkullBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/WearableCarvedPumpkinBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V -transitive-accessible method net/minecraft/block/WeightedPressurePlateBlock (ILnet/minecraft/block/AbstractBlock$Settings;Lnet/minecraft/block/BlockSetType;)V +transitive-accessible method net/minecraft/block/WeightedPressurePlateBlock (ILnet/minecraft/block/BlockSetType;Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/WetSpongeBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V transitive-accessible method net/minecraft/block/WitherSkullBlock (Lnet/minecraft/block/AbstractBlock$Settings;)V diff --git a/fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/SignBlockEntityTest.java b/fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/SignBlockEntityTest.java index f6c4db7419..4855b6308b 100644 --- a/fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/SignBlockEntityTest.java +++ b/fabric-transitive-access-wideners-v1/src/testmod/java/net/fabricmc/fabric/test/access/SignBlockEntityTest.java @@ -37,13 +37,13 @@ public final class SignBlockEntityTest implements ModInitializer { public static final String MOD_ID = "fabric-transitive-access-wideners-v1-testmod"; - public static final SignBlock TEST_SIGN = new SignBlock(FabricBlockSettings.copy(Blocks.OAK_SIGN), WoodType.OAK) { + public static final SignBlock TEST_SIGN = new SignBlock(WoodType.OAK, FabricBlockSettings.copy(Blocks.OAK_SIGN)) { @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return new TestSign(pos, state); } }; - public static final WallSignBlock TEST_WALL_SIGN = new WallSignBlock(FabricBlockSettings.copy(Blocks.OAK_SIGN), WoodType.OAK) { + public static final WallSignBlock TEST_WALL_SIGN = new WallSignBlock(WoodType.OAK, FabricBlockSettings.copy(Blocks.OAK_SIGN)) { @Override public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { return new TestSign(pos, state); diff --git a/fabric-transitive-access-wideners-v1/template.accesswidener b/fabric-transitive-access-wideners-v1/template.accesswidener index feab2c8c4f..367b81bfaf 100644 --- a/fabric-transitive-access-wideners-v1/template.accesswidener +++ b/fabric-transitive-access-wideners-v1/template.accesswidener @@ -125,13 +125,13 @@ 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/PillarBlock; -transitive-accessible method net/minecraft/block/Blocks createFlowerPotBlock (Lnet/minecraft/block/Block;[Lnet/minecraft/resource/featuretoggle/FeatureFlag;)Lnet/minecraft/block/FlowerPotBlock; -transitive-accessible method net/minecraft/block/Blocks createLeavesBlock (Lnet/minecraft/sound/BlockSoundGroup;)Lnet/minecraft/block/LeavesBlock; -transitive-accessible method net/minecraft/block/Blocks createLogBlock (Lnet/minecraft/block/MapColor;Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/PillarBlock; +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; transitive-accessible method net/minecraft/block/Blocks createNetherStemBlock (Lnet/minecraft/block/MapColor;)Lnet/minecraft/block/Block; -transitive-accessible method net/minecraft/block/Blocks createStoneButtonBlock ()Lnet/minecraft/block/ButtonBlock; -transitive-accessible method net/minecraft/block/Blocks createWoodenButtonBlock (Lnet/minecraft/block/BlockSetType;[Lnet/minecraft/resource/featuretoggle/FeatureFlag;)Lnet/minecraft/block/ButtonBlock; +transitive-accessible method net/minecraft/block/Blocks createStoneButtonBlock ()Lnet/minecraft/block/Block; +transitive-accessible method net/minecraft/block/Blocks createWoodenButtonBlock (Lnet/minecraft/block/BlockSetType;)Lnet/minecraft/block/Block; # Methods used in block creation transitive-accessible method net/minecraft/block/Blocks always (Lnet/minecraft/block/BlockState;Lnet/minecraft/world/BlockView;Lnet/minecraft/util/math/BlockPos;)Z diff --git a/gradle.properties b/gradle.properties index 1b8a4ffcb5..3b6889b7a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,18 @@ org.gradle.jvmargs=-Xmx2560M org.gradle.parallel=true fabric.loom.multiProjectOptimisation=true -version=0.89.3 -minecraft_version=1.20.2 -yarn_version=+build.1 -loader_version=0.14.22 +version=0.89.4 +minecraft_version=23w40a +yarn_version=+build.2 +loader_version=0.14.23 installer_version=0.11.1 -prerelease=false -curseforge_minecraft_version=1.20.2 +prerelease=true +curseforge_minecraft_version=1.20.3-Snapshot # Do not manually update, use the bumpversions task: fabric-api-base-version=0.4.33 -fabric-api-lookup-api-v1-version=1.6.41 +fabric-api-lookup-api-v1-version=1.6.42 fabric-biome-api-v1-version=13.0.12 fabric-block-api-v1-version=1.0.12 fabric-block-view-api-v2-version=1.0.1 @@ -24,10 +24,10 @@ fabric-commands-v0-version=0.2.53 fabric-containers-v0-version=0.1.72 fabric-content-registries-v0-version=5.0.4 fabric-crash-report-info-v1-version=0.2.20 -fabric-data-generation-api-v1-version=13.1.2 +fabric-data-generation-api-v1-version=13.1.3 fabric-dimensions-v1-version=2.1.56 fabric-entity-events-v1-version=1.5.25 -fabric-events-interaction-v0-version=0.6.9 +fabric-events-interaction-v0-version=0.6.10 fabric-events-lifecycle-v0-version=0.2.68 fabric-game-rule-api-v1-version=1.0.40 fabric-gametest-api-v1-version=1.2.15 @@ -42,10 +42,10 @@ fabric-mining-level-api-v1-version=2.1.54 fabric-model-loading-api-v1-version=1.0.5 fabric-models-v0-version=0.4.4 fabric-networking-api-v1-version=3.0.8 -fabric-object-builder-api-v1-version=12.1.1 +fabric-object-builder-api-v1-version=13.0.0 fabric-particles-v1-version=1.1.4 fabric-recipe-api-v1-version=2.0.5 -fabric-registry-sync-v0-version=4.0.3 +fabric-registry-sync-v0-version=4.0.4 fabric-renderer-api-v1-version=3.2.1 fabric-renderer-indigo-version=1.5.1 fabric-renderer-registries-v1-version=3.2.48 @@ -56,9 +56,9 @@ fabric-rendering-v1-version=3.0.10 fabric-resource-conditions-api-v1-version=2.3.9 fabric-resource-loader-v0-version=0.11.11 fabric-screen-api-v1-version=2.0.11 -fabric-screen-handler-api-v1-version=1.3.38 +fabric-screen-handler-api-v1-version=1.3.39 fabric-sound-api-v1-version=1.0.14 -fabric-transfer-api-v1-version=3.3.8 -fabric-transitive-access-wideners-v1-version=5.0.3 +fabric-transfer-api-v1-version=3.3.9 +fabric-transitive-access-wideners-v1-version=5.0.4 fabric-convention-tags-v1-version=1.5.7 fabric-client-tags-api-v1-version=1.1.4 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 08aeb5ae21..85b1a49996 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,9 +19,9 @@ "FabricMC" ], "depends": { - "fabricloader": ">=0.14.22", + "fabricloader": ">=0.14.23", "java": ">=17", - "minecraft": ">=1.20.2- <1.20.3-" + "minecraft": ">=1.20.3- <1.20.4-" }, "description": "Core API module providing key hooks and intercompatibility features." }