diff --git a/checkstyle.xml b/checkstyle.xml index 2574b46b00..0fbe4531d2 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -284,6 +284,32 @@ + + + + + + + + + + + + diff --git a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/LivingEntityMixin.java b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/LivingEntityMixin.java index 542a6f2f49..eba98e9bc3 100644 --- a/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/LivingEntityMixin.java +++ b/fabric-block-api-v1/src/main/java/net/fabricmc/fabric/mixin/block/LivingEntityMixin.java @@ -38,7 +38,7 @@ abstract class LivingEntityMixin { allow = 1, cancellable = true ) - private void allowTaggedBlocksForTrapdoorClimbing(BlockPos pos, BlockState state, CallbackInfoReturnable info, @Local(ordinal = 1) BlockState belowState) { + private void allowTaggedBlocksForTrapdoorClimbing(BlockPos pos, BlockState state, CallbackInfoReturnable info, @Local(name = "belowState") BlockState belowState) { if (belowState.is(BlockFunctionalityTags.CAN_CLIMB_TRAPDOOR_ABOVE)) { if (belowState.getBlock() instanceof LadderBlock) { // Check that the ladder and trapdoor are placed in the same direction. diff --git a/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderRegionCacheMixin.java b/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderRegionCacheMixin.java index 0a34c07572..e55f4a8afe 100644 --- a/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderRegionCacheMixin.java +++ b/fabric-block-getter-api-v2/src/client/java/net/fabricmc/fabric/mixin/blockgetter/client/RenderRegionCacheMixin.java @@ -50,7 +50,7 @@ public abstract class RenderRegionCacheMixin { private static final Logger LOGGER = LoggerFactory.getLogger(RenderRegionCacheMixin.class); @Inject(method = "createRegion", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/chunk/RenderRegionCache;getSectionDataCopy(Lnet/minecraft/world/level/Level;III)Lnet/minecraft/client/renderer/chunk/SectionCopy;")) - private void copyDataForChunk(Level level, long packedChunkPos, CallbackInfoReturnable cir, @Share("dataMap") LocalRef> mapRef, @Local(ordinal = 11) int x, @Local(ordinal = 10) int y, @Local(ordinal = 9) int z) { + private void copyDataForChunk(Level level, long packedChunkPos, CallbackInfoReturnable cir, @Share("dataMap") LocalRef> mapRef, @Local(name = "regionSectionX") int regionSectionX, @Local(name = "regionSectionY") int regionSectionY, @Local(name = "regionSectionZ") int regionSectionZ) { // Hash maps in chunks should generally not be modified outside of client thread // but does happen in practice, due to mods or inconsistent vanilla behaviors, causing // CMEs when we iterate the map. (Vanilla does not iterate these maps when it builds @@ -59,7 +59,7 @@ private void copyDataForChunk(Level level, long packedChunkPos, CallbackInfoRetu // We handle this simply by retrying until it works. Ugly but effective. while (true) { try { - mapRef.set(mapChunk(level.getChunk(x, z), SectionPos.of(packedChunkPos), mapRef.get())); + mapRef.set(mapChunk(level.getChunk(regionSectionX, regionSectionZ), SectionPos.of(packedChunkPos), mapRef.get())); break; } catch (ConcurrentModificationException e) { final int count = ERROR_COUNTER.incrementAndGet(); diff --git a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/world/CreateWorldScreenMixin.java b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/world/CreateWorldScreenMixin.java index 0e1c43b5b8..89e2bf819b 100644 --- a/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/world/CreateWorldScreenMixin.java +++ b/fabric-client-gametest-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/gametest/world/CreateWorldScreenMixin.java @@ -38,9 +38,9 @@ @Mixin(CreateWorldScreen.class) public class CreateWorldScreenMixin { @Inject(method = "onCreate", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/WorldOpenFlows;confirmWorldCreation(Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lcom/mojang/serialization/Lifecycle;Ljava/lang/Runnable;Z)V"), cancellable = true) - private void createLevelDataForServers(CallbackInfo ci, @Local LayeredRegistryAccess registries, @Local PrimaryLevelData levelData) { + private void createLevelDataForServers(CallbackInfo ci, @Local(name = "finalLayers") LayeredRegistryAccess finalLayers, @Local(name = "worldData") PrimaryLevelData worldData) { if (DedicatedServerImplUtil.saveLevelDataTo != null) { - CompoundTag levelDatInner = levelData.createTag(registries.compositeAccess(), null); + CompoundTag levelDatInner = worldData.createTag(finalLayers.compositeAccess(), null); CompoundTag levelDat = new CompoundTag(); levelDat.put("Data", levelDatInner); diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/PathfindingContextMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/PathfindingContextMixin.java index 0f8d84dabf..6d197c114b 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/PathfindingContextMixin.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/PathfindingContextMixin.java @@ -43,7 +43,7 @@ public abstract class PathfindingContextMixin { * Overrides the node type for the specified position, if the position is found as neighbor block in a path. */ @Inject(method = "getPathTypeFromState", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/core/BlockPos$MutableBlockPos;set(III)Lnet/minecraft/core/BlockPos$MutableBlockPos;"), cancellable = true) - private void onGetNodeType(int x, int y, int z, CallbackInfoReturnable cir, @Local BlockPos pos) { + private void onGetNodeType(int x, int y, int z, CallbackInfoReturnable cir, @Local(name = "pos") BlockPos pos) { final PathType neighborPathType = LandPathTypeRegistry.getPathType(getBlockState(pos), level(), pos, true); if (neighborPathType != null) { diff --git a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/WalkNodeEvaluatorMixin.java b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/WalkNodeEvaluatorMixin.java index 110592cf72..22cffad946 100644 --- a/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/WalkNodeEvaluatorMixin.java +++ b/fabric-content-registries-v0/src/main/java/net/fabricmc/fabric/mixin/content/registry/WalkNodeEvaluatorMixin.java @@ -37,8 +37,8 @@ public class WalkNodeEvaluatorMixin { * Overrides the node type for the specified position, if the position is a direct target in a path. */ @Inject(method = "getPathTypeFromState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getBlock()Lnet/minecraft/world/level/block/Block;"), cancellable = true) - private static void getCommonNodeType(BlockGetter level, BlockPos pos, CallbackInfoReturnable cir, @Local BlockState state) { - PathType pathType = LandPathTypeRegistry.getPathType(state, level, pos, false); + private static void getCommonNodeType(BlockGetter level, BlockPos pos, CallbackInfoReturnable cir, @Local(name = "blockState") BlockState blockState) { + PathType pathType = LandPathTypeRegistry.getPathType(blockState, level, pos, false); if (pathType != null) { cir.setReturnValue(pathType); diff --git a/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java b/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java index bc6e433347..e3024244ac 100644 --- a/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java +++ b/fabric-data-attachment-api-v1/src/client/java/net/fabricmc/fabric/mixin/attachment/client/ClientPacketListenerMixin.java @@ -44,7 +44,7 @@ abstract class ClientPacketListenerMixin { from = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientPacketListener;startWaitingForNewLevel(Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/gui/screens/LevelLoadingScreen$Reason;)V") ) ) - private void copyAttachmentsOnClientRespawn(Minecraft client, LocalPlayer newPlayer, Operation init, ClientboundRespawnPacket packet, @Local(ordinal = 0) LocalPlayer oldPlayer) { + private void copyAttachmentsOnClientRespawn(Minecraft client, LocalPlayer newPlayer, Operation init, ClientboundRespawnPacket packet, @Local(name = "oldPlayer") LocalPlayer oldPlayer) { /* * The KEEP_ATTRIBUTES flag is not set on a death respawn, and set in all other cases */ diff --git a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java index 8fcfaa4192..69597daa21 100644 --- a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java +++ b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java @@ -73,10 +73,10 @@ private void registerItemModels(ItemModelGenerators instance, Operation or @Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/models/BlockModelGenerators;run()V")) private void setFabricPackOutput(CachedOutput output, CallbackInfoReturnable> cir, - @Local ModelProvider.BlockStateGeneratorCollector blockStateGeneratorCollector, - @Local ModelProvider.ItemInfoCollector itemInfoCollectors) { - ((FabricModelProviderDefinitions) blockStateGeneratorCollector).setFabricPackOutput(fabricPackOutput); - ((FabricModelProviderDefinitions) itemInfoCollectors).setFabricPackOutput(fabricPackOutput); - ((FabricItemAssetDefinitions) itemInfoCollectors).fabric_setProcessedBlocks(blockStateGeneratorCollector.generators.keySet()); + @Local(name = "blockStateGenerators") ModelProvider.BlockStateGeneratorCollector blockStateGenerators, + @Local(name = "itemModels") ModelProvider.ItemInfoCollector itemModels) { + ((FabricModelProviderDefinitions) blockStateGenerators).setFabricPackOutput(fabricPackOutput); + ((FabricModelProviderDefinitions) itemModels).setFabricPackOutput(fabricPackOutput); + ((FabricItemAssetDefinitions) itemModels).fabric_setProcessedBlocks(blockStateGenerators.generators.keySet()); } } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java index 7c918e9281..c2afdebd62 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagsProviderMixin.java @@ -58,8 +58,8 @@ private void initPathResolver(PackOutput output, ResourceKey(Ljava/util/List;Z)V"), index = 1) - private boolean addReplaced(boolean replaced, @Local TagBuilder tagBuilder) { - if (tagBuilder instanceof FabricTagBuilder fabricTagBuilder) { + private boolean addReplaced(boolean replaced, @Local(name = "builder") TagBuilder builder) { + if (builder instanceof FabricTagBuilder fabricTagBuilder) { return fabricTagBuilder.fabric_isReplaced(); } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/AllCraftingRecipeJsonBuildersMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/AllCraftingRecipeJsonBuildersMixin.java index 070402b207..e1e03e49ba 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/AllCraftingRecipeJsonBuildersMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/AllCraftingRecipeJsonBuildersMixin.java @@ -37,7 +37,7 @@ TransmuteRecipeBuilder.class, }) abstract class AllCraftingRecipeJsonBuildersMixin { - @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true) + @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true, name = "id") private ResourceKey> modifyRecipeKey(ResourceKey> recipeKey, RecipeOutput output) { return ResourceKey.create(recipeKey.registryKey(), output.getRecipeIdentifier(recipeKey.identifier())); } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTransformRecipeBuilderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTransformRecipeBuilderMixin.java index 9762f432cc..6b858ea8b9 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTransformRecipeBuilderMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTransformRecipeBuilderMixin.java @@ -27,7 +27,7 @@ @Mixin(SmithingTransformRecipeBuilder.class) abstract class SmithingTransformRecipeBuilderMixin { - @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true) + @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true, name = "id") private ResourceKey> modifyRecipeKey(ResourceKey> recipeKey, RecipeOutput output) { return ResourceKey.create(recipeKey.registryKey(), output.getRecipeIdentifier(recipeKey.identifier())); } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTrimRecipeBuilderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTrimRecipeBuilderMixin.java index 5e67857692..78f66ae356 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTrimRecipeBuilderMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SmithingTrimRecipeBuilderMixin.java @@ -27,7 +27,7 @@ @Mixin(SmithingTrimRecipeBuilder.class) abstract class SmithingTrimRecipeBuilderMixin { - @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true) + @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true, name = "id") private ResourceKey> modifyRecipeKey(ResourceKey> recipeKey, RecipeOutput output) { return ResourceKey.create(recipeKey.registryKey(), output.getRecipeIdentifier(recipeKey.identifier())); } diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SpecialRecipeBuilderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SpecialRecipeBuilderMixin.java index d7e5279db9..c1976711aa 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SpecialRecipeBuilderMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/recipe/SpecialRecipeBuilderMixin.java @@ -27,7 +27,7 @@ @Mixin(SpecialRecipeBuilder.class) abstract class SpecialRecipeBuilderMixin { - @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true) + @ModifyVariable(method = "save(Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V", at = @At("HEAD"), argsOnly = true, name = "id") private ResourceKey> modifyRecipeKey(ResourceKey> recipeKey, RecipeOutput output) { return ResourceKey.create(recipeKey.registryKey(), output.getRecipeIdentifier(recipeKey.identifier())); } diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java index 61f297b18b..1e392c3824 100644 --- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java +++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/LivingEntityMixin.java @@ -85,9 +85,9 @@ private void beforeDamage(ServerLevel level, DamageSource source, float amount, } @Inject(method = "hurtServer", at = @At("TAIL")) - private void afterDamage(ServerLevel level, DamageSource source, float amount, CallbackInfoReturnable cir, @Local(ordinal = 1) float dealt, @Local(ordinal = 0) boolean blocked) { + private void afterDamage(ServerLevel level, DamageSource source, float amount, CallbackInfoReturnable cir, @Local(name = "originalDamage") float originalDamage, @Local(name = "blocked") boolean blocked) { if (!isDeadOrDying()) { - ServerLivingEntityEvents.AFTER_DAMAGE.invoker().afterDamage((LivingEntity) (Object) this, source, dealt, amount, blocked); + ServerLivingEntityEvents.AFTER_DAMAGE.invoker().afterDamage((LivingEntity) (Object) this, source, originalDamage, amount, blocked); } } diff --git a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java index 449be03c17..51ec15682b 100644 --- a/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java +++ b/fabric-entity-events-v1/src/main/java/net/fabricmc/fabric/mixin/entity/event/effect/LivingEntityMixin.java @@ -179,13 +179,13 @@ private void beforeRemoveEffect(Holder holder, CallbackInfoReturnable target = "Ljava/util/Iterator;remove()V" ) ) - private void beforeExpireRemoveEffect(CallbackInfo ci, @Local MobEffectInstance effectInstance) { + private void beforeExpireRemoveEffect(CallbackInfo ci, @Local(name = "effect") MobEffectInstance effect) { if (this.isClient()) { return; } ServerMobEffectEvents.BEFORE_REMOVE.invoker() - .beforeRemove(effectInstance, this.self(), MobEffectUtil.getCommandContext()); + .beforeRemove(effect, this.self(), MobEffectUtil.getCommandContext()); } @Inject( diff --git a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java index 9b4addb4e7..61ba2ca4ce 100644 --- a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java +++ b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MinecraftMixin.java @@ -74,7 +74,7 @@ public abstract class MinecraftMixin { method = "startUseItem", cancellable = true ) - private void injectUseEntityCallback(CallbackInfo ci, @Local InteractionHand hand, @Local EntityHitResult hitResult, @Local Entity entity) { + private void injectUseEntityCallback(CallbackInfo ci, @Local(name = "hand") InteractionHand hand, @Local(name = "entityHit") EntityHitResult hitResult, @Local(name = "entity") Entity entity) { InteractionResult result = UseEntityCallback.EVENT.invoker().interact(player, player.level(), hand, entity, hitResult); if (result != InteractionResult.PASS) { diff --git a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java index 936c890f59..2d03e488b6 100644 --- a/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java +++ b/fabric-events-interaction-v0/src/client/java/net/fabricmc/fabric/mixin/event/interaction/client/MultiPlayerGameModeMixin.java @@ -91,8 +91,8 @@ private void fabric_fireAttackBlockCallback(BlockPos pos, Direction direction, C } @Inject(method = "destroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;destroy(Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V")) - private void fabric$onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, @Local BlockState blockState) { - ClientPlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(minecraft.level, minecraft.player, pos, blockState); + private void fabric$onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, @Local(name = "oldState") BlockState oldState) { + ClientPlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(minecraft.level, minecraft.player, pos, oldState); } @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/MultiPlayerGameMode;startPrediction(Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/multiplayer/prediction/PredictiveAction;)V"), method = "useItemOn", cancellable = true) diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java index 93ace511f6..72b5705a50 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerGamePacketListenerImplMixin.java @@ -80,8 +80,8 @@ public ItemStack onPickItemFromEntity(Entity entity, Operation operat return ItemStack.EMPTY; } - @Inject(method = "handleInteract", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;")) - public void handleInteract(ServerboundInteractPacket packet, CallbackInfo info, @Local Entity target) { + @Inject(method = "handleInteract", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;getItemInHand(Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack;"), cancellable = true) + public void handleInteract(ServerboundInteractPacket packet, CallbackInfo info, @Local(name = "target") Entity target) { Level level = player.level(); EntityHitResult hitResult = new EntityHitResult(target, packet.location().add(target.getX(), target.getY(), target.getZ())); diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java index 8bec43d30f..37580d2c10 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/ServerPlayerGameModeMixin.java @@ -104,18 +104,18 @@ public void interactItem(ServerPlayer player, Level level, ItemStack stack, Inte } @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;playerWillDestroy(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/level/block/state/BlockState;"), method = "destroyBlock", cancellable = true) - private void breakBlock(BlockPos pos, CallbackInfoReturnable cir, @Local BlockEntity entity, @Local BlockState state) { - boolean result = PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak(this.level, this.player, pos, state, entity); + private void breakBlock(BlockPos pos, CallbackInfoReturnable cir, @Local(name = "blockEntity") BlockEntity blockEntity, @Local(name = "state") BlockState state) { + boolean result = PlayerBlockBreakEvents.BEFORE.invoker().beforeBlockBreak(this.level, this.player, pos, state, blockEntity); if (!result) { - PlayerBlockBreakEvents.CANCELED.invoker().onBlockBreakCanceled(this.level, this.player, pos, state, entity); + PlayerBlockBreakEvents.CANCELED.invoker().onBlockBreakCanceled(this.level, this.player, pos, state, blockEntity); cir.setReturnValue(false); } } @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;destroy(Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V"), method = "destroyBlock") - private void onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, @Local BlockEntity entity, @Local BlockState state) { - PlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(this.level, this.player, pos, state, entity); + private void onBlockBroken(BlockPos pos, CallbackInfoReturnable cir, @Local(name = "blockEntity") BlockEntity blockEntity, @Local(name = "adjustedState") BlockState adjustedState) { + PlayerBlockBreakEvents.AFTER.invoker().afterBlockBreak(this.level, this.player, pos, adjustedState, blockEntity); } } diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/StructureTemplateManagerMixin.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/StructureTemplateManagerMixin.java index 81c4bfee10..ba7b95a445 100644 --- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/StructureTemplateManagerMixin.java +++ b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/StructureTemplateManagerMixin.java @@ -79,7 +79,7 @@ private Stream streamTemplatesFromResource() { } @Inject(method = "", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList$Builder;add(Ljava/lang/Object;)Lcom/google/common/collect/ImmutableList$Builder;", ordinal = 2, shift = At.Shift.AFTER)) - private void addFabricTemplateProvider(ResourceManager resourceManager, LevelStorageSource.LevelStorageAccess storageAccess, DataFixer dataFixer, HolderGetter blockLookup, CallbackInfo ci, @Local ImmutableList.Builder builder) { + private void addFabricTemplateProvider(ResourceManager resourceManager, LevelStorageSource.LevelStorageAccess storageAccess, DataFixer dataFixer, HolderGetter blockLookup, CallbackInfo ci, @Local(name = "builder") ImmutableList.Builder builder) { builder.add(new StructureTemplateManager.Source(this::fabric_loadSnbtFromResource, this::streamTemplatesFromResource)); } } diff --git a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java index e95da801d8..a2582a3694 100644 --- a/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java +++ b/fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server/MainMixin.java @@ -38,7 +38,7 @@ private static boolean isEulaAgreedTo(boolean isEulaAgreedTo) { // Inject after packRepository is stored @Inject(method = "main", cancellable = true, at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/server/packs/repository/ServerPacksSource;createPackRepository(Lnet/minecraft/world/level/storage/LevelStorageSource$LevelStorageAccess;)Lnet/minecraft/server/packs/repository/PackRepository;")) - private static void main(String[] args, CallbackInfo info, @Local LevelStorageSource.LevelStorageAccess storageAccess, @Local PackRepository packRepository) { + private static void main(String[] args, CallbackInfo info, @Local(name = "access") LevelStorageSource.LevelStorageAccess storageAccess, @Local(name = "packRepository") PackRepository packRepository) { if (FabricGameTestRunner.ENABLED) { FabricGameTestRunner.runHeadlessServer(storageAccess, packRepository); info.cancel(); // Do not progress in starting the normal dedicated server diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java index f339a4a203..a178fdf89b 100644 --- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java +++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/AnvilMenuMixin.java @@ -47,7 +47,7 @@ abstract class AnvilMenuMixin extends ItemCombinerMenu { target = "Lnet/minecraft/world/item/enchantment/Enchantment;canEnchant(Lnet/minecraft/world/item/ItemStack;)Z" ) ) - private boolean callAllowEnchantingEvent(Enchantment instance, ItemStack stack, @Local Holder holder) { - return stack.canBeEnchantedWith(holder, EnchantingContext.ACCEPTABLE); + private boolean callAllowEnchantingEvent(Enchantment instance, ItemStack stack, @Local(name = "enchantmentHolder") Holder enchantmentHolder) { + return stack.canBeEnchantedWith(enchantmentHolder, EnchantingContext.ACCEPTABLE); } } diff --git a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java index 6b6b7856dd..6859b309ab 100644 --- a/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java +++ b/fabric-item-api-v1/src/main/java/net/fabricmc/fabric/mixin/item/BrewingStandBlockEntityMixin.java @@ -29,7 +29,7 @@ @Mixin(BrewingStandBlockEntity.class) public class BrewingStandBlockEntityMixin { @Redirect(method = "doBrew", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/Item;getCraftingRemainder()Lnet/minecraft/world/item/ItemStackTemplate;")) - private static ItemStackTemplate getCraftingRemainder(Item item, @Local(ordinal = 0) ItemStack stack) { - return stack.getCraftingRemainder(); + private static ItemStackTemplate getCraftingRemainder(Item item, @Local(name = "ingredient") ItemStack ingredient) { + return ingredient.getCraftingRemainder(); } } diff --git a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientChunkCacheMixin.java b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientChunkCacheMixin.java index 500c52ad06..209dd9dbb8 100644 --- a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientChunkCacheMixin.java +++ b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/ClientChunkCacheMixin.java @@ -50,15 +50,15 @@ private void onChunkLoad(int x, int z, FriendlyByteBuf friendlyByteBuf, Map highmap, Consumer consumer, CallbackInfoReturnable info, @Local LevelChunk levelChunk) { - if (levelChunk != null) { - ClientChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload(this.level, levelChunk); + private void onChunkUnload(int x, int z, FriendlyByteBuf buf, Map highmap, Consumer consumer, CallbackInfoReturnable info, @Local(name = "chunk") LevelChunk chunk) { + if (chunk != null) { + ClientChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload(this.level, chunk); } } @Inject(method = "drop", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientChunkCache$Storage;drop(ILnet/minecraft/world/level/chunk/LevelChunk;)V")) - private void onChunkUnload(ChunkPos pos, CallbackInfo ci, @Local LevelChunk chunk) { - ClientChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload(this.level, chunk); + private void onChunkUnload(ChunkPos pos, CallbackInfo ci, @Local(name = "currentChunk") LevelChunk currentChunk) { + ClientChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload(this.level, currentChunk); } @Inject( @@ -68,9 +68,9 @@ private void onChunkUnload(ChunkPos pos, CallbackInfo ci, @Local LevelChunk chun target = "Lnet/minecraft/client/multiplayer/ClientChunkCache$Storage;inRange(II)Z" ) ) - private void onUpdateLoadDistance(int loadDistance, CallbackInfo ci, @Local ClientChunkCache.Storage clientChunkCacheStorage, @Local LevelChunk oldChunk, @Local ChunkPos chunkPos) { - if (!clientChunkCacheStorage.inRange(chunkPos.x(), chunkPos.z())) { - ClientChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload(this.level, oldChunk); + private void onUpdateLoadDistance(int loadDistance, CallbackInfo ci, @Local(name = "newStorage") ClientChunkCache.Storage newStorage, @Local(name = "chunk") LevelChunk chunk, @Local(name = "pos") ChunkPos pos) { + if (!newStorage.inRange(pos.x(), pos.z())) { + ClientChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload(this.level, chunk); } } } diff --git a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java index 68a621a230..9ec1b54e80 100644 --- a/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java +++ b/fabric-lifecycle-events-v1/src/client/java/net/fabricmc/fabric/mixin/event/lifecycle/client/LevelChunkMixin.java @@ -62,12 +62,12 @@ private V onLoadBlockEntity(V removedBlockEntity, BlockEntity blockEntity) { } @Inject(method = "setBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BlockEntity;setRemoved()V", shift = At.Shift.AFTER)) - private void onRemoveBlockEntity(BlockEntity blockEntity, CallbackInfo info, @Local(ordinal = 1) BlockEntity removedBlockEntity) { - if (removedBlockEntity != null) { + private void onRemoveBlockEntity(BlockEntity blockEntity, CallbackInfo info, @Local(name = "previousEntry") BlockEntity previousEntry) { + if (previousEntry != null) { if (this.getLevel() instanceof ServerLevel) { - ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removedBlockEntity, (ServerLevel) this.getLevel()); + ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(previousEntry, (ServerLevel) this.getLevel()); } else if (this.getLevel() instanceof ClientLevel) { - ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removedBlockEntity, (ClientLevel) this.getLevel()); + ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(previousEntry, (ClientLevel) this.getLevel()); } } } @@ -90,12 +90,12 @@ private Object onRemoveBlockEntity(Map map, K key) { } @Inject(method = "removeBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BlockEntity;setRemoved()V")) - private void onRemoveBlockEntity(BlockPos pos, CallbackInfo ci, @Local @Nullable BlockEntity removed) { - if (removed != null) { + private void onRemoveBlockEntity(BlockPos pos, CallbackInfo ci, @Local(name = "removeThis") @Nullable BlockEntity removeThis) { + if (removeThis != null) { if (this.getLevel() instanceof ServerLevel) { - ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removed, (ServerLevel) this.getLevel()); + ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removeThis, (ServerLevel) this.getLevel()); } else if (this.getLevel() instanceof ClientLevel) { - ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removed, (ClientLevel) this.getLevel()); + ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removeThis, (ClientLevel) this.getLevel()); } } } diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/ChunkMapMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/ChunkMapMixin.java index dcfb556ebf..02abade4e7 100644 --- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/ChunkMapMixin.java +++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/ChunkMapMixin.java @@ -45,7 +45,7 @@ public abstract class ChunkMapMixin { * We inject just after "setLoaded" is made false, since here the LevelChunk is guaranteed to be unloaded. */ @Inject(method = "lambda$scheduleUnload$0", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;save(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z")) - private void onChunkUnload(ChunkHolder chunkHolder, CompletableFuture completableFuture, long l, CallbackInfo ci, @Local ChunkAccess chunk) { + private void onChunkUnload(ChunkHolder chunkHolder, CompletableFuture completableFuture, long l, CallbackInfo ci, @Local(name = "chunk") ChunkAccess chunk) { if (chunk instanceof LevelChunk levelChunk) { ServerChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload(this.level, levelChunk); } diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/LivingEntityMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/LivingEntityMixin.java index 87671ffc3b..eb8f6507d3 100644 --- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/LivingEntityMixin.java +++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/LivingEntityMixin.java @@ -34,7 +34,7 @@ @Mixin(LivingEntity.class) public abstract class LivingEntityMixin { @Inject(method = "collectEquipmentChanges", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) - private void getEquipmentChanges(CallbackInfoReturnable<@Nullable Map> cir, @Local EquipmentSlot equipmentSlot, @Local(ordinal = 0) ItemStack previousStack, @Local(ordinal = 1) ItemStack currentStack) { - ServerEntityEvents.EQUIPMENT_CHANGE.invoker().onChange((LivingEntity) (Object) this, equipmentSlot, previousStack, currentStack); + private void getEquipmentChanges(CallbackInfoReturnable<@Nullable Map> cir, @Local(name = "slot") EquipmentSlot slot, @Local(name = "previous") ItemStack previous, @Local(name = "current") ItemStack current) { + ServerEntityEvents.EQUIPMENT_CHANGE.invoker().onChange((LivingEntity) (Object) this, slot, previous, current); } } diff --git a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java index 37c2042c91..dcdf88734f 100644 --- a/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java +++ b/fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/MinecraftServerMixin.java @@ -82,8 +82,8 @@ private V onLoadWorld(Map levels, K dimension, V level, Operation V onLoadBlockEntity(V removedBlockEntity, BlockEntity blockEntity) { } @Inject(method = "setBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BlockEntity;setRemoved()V", shift = At.Shift.AFTER)) - private void onRemoveBlockEntity(BlockEntity blockEntity, CallbackInfo info, @Local(ordinal = 1) BlockEntity removedBlockEntity) { + private void onRemoveBlockEntity(BlockEntity blockEntity, CallbackInfo info, @Local(name = "previousEntry") BlockEntity previousEntry) { if (this.getLevel() instanceof ServerLevel) { - ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removedBlockEntity, (ServerLevel) this.getLevel()); + ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(previousEntry, (ServerLevel) this.getLevel()); } } @@ -83,9 +83,9 @@ private Object onRemoveBlockEntity(Map map, K key) { } @Inject(method = "removeBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/entity/BlockEntity;setRemoved()V")) - private void onRemoveBlockEntity(BlockPos pos, CallbackInfo ci, @Local @Nullable BlockEntity removed) { - if (removed != null && this.getLevel() instanceof ServerLevel) { - ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removed, (ServerLevel) this.getLevel()); + private void onRemoveBlockEntity(BlockPos pos, CallbackInfo ci, @Local(name = "removeThis") @Nullable BlockEntity removeThis) { + if (removeThis != null && this.getLevel() instanceof ServerLevel) { + ServerBlockEntityEvents.BLOCK_ENTITY_UNLOAD.invoker().onUnload(removeThis, (ServerLevel) this.getLevel()); } } } diff --git a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java index d6f9a68bb7..68b561b676 100644 --- a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java +++ b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/ReloadableServerRegistriesMixin.java @@ -74,7 +74,7 @@ private static RegistryOps storeOps(HolderLookup.Provider holder, D } @WrapOperation(method = "reload", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;thenApplyAsync(Ljava/util/function/Function;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;")) - private static CompletableFuture> removeOps(CompletableFuture>> future, Function>, ? extends LayeredRegistryAccess> fn, Executor executor, Operation>> original, @Local RegistryOps ops) { + private static CompletableFuture> removeOps(CompletableFuture>> future, Function>, ? extends LayeredRegistryAccess> fn, Executor executor, Operation>> original, @Local(name = "ops") RegistryOps ops) { return original.call(future.thenApply(v -> { WRAPPERS.remove(ops); return v; @@ -82,8 +82,8 @@ private static CompletableFuture> removeOps } @Inject(method = "lambda$scheduleRegistryLoad$0", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V")) - private static void modifyLootTable(LootDataType lootDataType, ResourceManager resourceManager, RegistryOps registryOps, CallbackInfoReturnable> cir, @Local Map map) { - map.replaceAll((identifier, t) -> modifyLootTable(t, identifier, registryOps)); + private static void modifyLootTable(LootDataType lootDataType, ResourceManager resourceManager, RegistryOps registryOps, CallbackInfoReturnable> cir, @Local(name = "elements") Map elements) { + elements.replaceAll((identifier, t) -> modifyLootTable(t, identifier, registryOps)); } @Unique diff --git a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/SimpleJsonResourceReloadListenerMixin.java b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/SimpleJsonResourceReloadListenerMixin.java index 581d6f9c54..660dad8c2e 100644 --- a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/SimpleJsonResourceReloadListenerMixin.java +++ b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/SimpleJsonResourceReloadListenerMixin.java @@ -39,7 +39,7 @@ @Mixin(SimpleJsonResourceReloadListener.class) public class SimpleJsonResourceReloadListenerMixin { @Inject(method = "scanDirectory(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/resources/FileToIdConverter;fileToId(Lnet/minecraft/resources/Identifier;)Lnet/minecraft/resources/Identifier;")) - private static void fillSourceMap(ResourceManager manager, FileToIdConverter fileToIdConverter, DynamicOps ops, Codec codec, Map result, CallbackInfo ci, @Local Map.Entry entry, @Local(ordinal = 1) Identifier id) { + private static void fillSourceMap(ResourceManager manager, FileToIdConverter fileToIdConverter, DynamicOps ops, Codec codec, Map result, CallbackInfo ci, @Local(name = "entry") Map.Entry entry, @Local(name = "id") Identifier id) { final String dirName = ((FileToIdConverterAccessor) fileToIdConverter).getPrefix(); if (!LootDataType.TABLE.registryKey().identifier().getPath().equals(dirName)) return; diff --git a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java index 93dc8908ed..6d7c006938 100644 --- a/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java +++ b/fabric-menu-api-v1/src/main/java/net/fabricmc/fabric/mixin/menu/ServerPlayerMixin.java @@ -66,7 +66,7 @@ private void fabric_closeContainerScreenIfAllowed(ServerPlayer player, MenuProvi } @Inject(method = "openMenu(Lnet/minecraft/world/MenuProvider;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V")) - private void fabric_storeOpenedMenu(MenuProvider factory, CallbackInfoReturnable info, @Local AbstractContainerMenu menu) { + private void fabric_storeOpenedMenu(MenuProvider factory, CallbackInfoReturnable info, @Local(name = "menu") AbstractContainerMenu menu) { if (factory instanceof ExtendedMenuProvider || (factory instanceof SimpleMenuProvider simpleFactory && simpleFactory.menuConstructor instanceof ExtendedMenuProvider)) { // Set the menu, so the factory method can access it through the player. containerMenu = menu; diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java index 4e9b296ec2..7f37a6c2da 100644 --- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java +++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelBakeryMixin.java @@ -83,7 +83,7 @@ private BiFunction hoo } @ModifyReturnValue(method = "bakeModels", at = @At("RETURN")) - private CompletableFuture withExtraModels(CompletableFuture models, @Local Executor executor, @Local ModelBakery.ModelBakerImpl baker) { + private CompletableFuture withExtraModels(CompletableFuture models, @Local(argsOnly = true) Executor executor, @Local(name = "baker") ModelBakery.ModelBakerImpl baker) { if (fabric_eventDispatcher == null) return models; CompletableFuture, Object>> extraModels = ParallelMapTransform.schedule(fabric_eventDispatcher.getExtraModels(), (key, model) -> { @@ -112,7 +112,7 @@ private static BlockStateModel wrapBlockModelBake(BlockStateModel.UnbakedRoot un } @WrapOperation(method = "lambda$bakeModels$1", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/item/ItemModel$Unbaked;bake(Lnet/minecraft/client/renderer/item/ItemModel$BakingContext;)Lnet/minecraft/client/renderer/item/ItemModel;")) - private ItemModel wrapItemModelBake(ItemModel.Unbaked unbakedModel, ItemModel.BakingContext bakeContext, Operation operation, @Local Identifier itemId) { + private ItemModel wrapItemModelBake(ItemModel.Unbaked unbakedModel, ItemModel.BakingContext bakeContext, Operation operation, @Local(argsOnly = true) Identifier itemId) { if (fabric_eventDispatcher == null) { return operation.call(unbakedModel, bakeContext); } diff --git a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java index a005305214..193a2bc7b5 100644 --- a/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java +++ b/fabric-model-loading-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/model/loading/ModelManagerMixin.java @@ -118,16 +118,16 @@ private Function withModelDispatcher(Function function) { @Inject(method = "discoverModelDependencies", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/ModelDiscovery;resolve()Ljava/util/Map;")) private static void resolveExtraModels( - Map modelMap, BlockStateModelLoader.LoadedModels stateDefinition, ClientItemInfoLoader.LoadedClientInfos result, CallbackInfoReturnable cir, - @Local ModelDiscovery collector + Map modelMap, BlockStateModelLoader.LoadedModels stateDefinition, ClientItemInfoLoader.LoadedClientInfos loadedClientInfos, CallbackInfoReturnable cir, + @Local(name = "result") ModelDiscovery result ) { // We know eventDispatcherFuture is available, as it is required by the item and block models (hookModels). ModelLoadingEventDispatcher eventDispatcher = ModelLoadingEventDispatcher.CURRENT.get(); - if (eventDispatcher != null) eventDispatcher.getExtraModels().values().forEach(collector::addRoot); + if (eventDispatcher != null) eventDispatcher.getExtraModels().values().forEach(result::addRoot); } @Inject(method = "apply", at = @At(value = "RETURN")) - private void onReturnUpload(CallbackInfo ci, @Local ModelBakery.BakingResult bakedModels) { + private void onReturnUpload(CallbackInfo ci, @Local(name = "bakedModels") ModelBakery.BakingResult bakedModels) { extraModels = ((BakedModelsHooks) (Object) bakedModels).fabric_getExtraModels(); } @@ -144,7 +144,7 @@ private static BlockModel cancelVanillaDeserialize(Reader reader) { // code doesn't explicitly cast the model to BlockModel, and the enclosing method returns UnbakedModels per // its return type, it's safe to return an UnbakedModel here. @ModifyArg(method = "lambda$loadBlockModels$2(Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair;", at = @At(value = "INVOKE", target = "Lcom/mojang/datafixers/util/Pair;of(Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/datafixers/util/Pair;"), index = 1) - private static Object actuallyDeserializeModel(Object originalModel, @Local Reader reader) { + private static Object actuallyDeserializeModel(Object originalModel, @Local(name = "reader") Reader reader) { return UnbakedModelDeserializer.deserialize(reader); } } diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/BundlePacketMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/BundlePacketMixin.java index 6f32e9f870..9427181b67 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/BundlePacketMixin.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/BundlePacketMixin.java @@ -29,7 +29,7 @@ @Mixin(BundlePacket.class) public class BundlePacketMixin { - @ModifyVariable(method = "", at = @At("HEAD"), argsOnly = true) + @ModifyVariable(method = "", at = @At("HEAD"), argsOnly = true, name = "packets") private static Iterable> flattenBundlePackets(Iterable> value) { var packets = new ArrayList>(); iterateBundle(value, packets); diff --git a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/IdDispatchCodecMixin.java b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/IdDispatchCodecMixin.java index df152cb818..67cf556330 100644 --- a/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/IdDispatchCodecMixin.java +++ b/fabric-networking-api-v1/src/main/java/net/fabricmc/fabric/mixin/networking/IdDispatchCodecMixin.java @@ -34,7 +34,7 @@ public abstract class IdDispatchCodecMixin implements StreamCodec { // Add the custom payload id to the error message @Inject(method = "encode(Lio/netty/buffer/ByteBuf;Ljava/lang/Object;)V", at = @At(value = "NEW", target = "(Ljava/lang/String;Ljava/lang/Throwable;)Lio/netty/handler/codec/EncoderException;")) - public void encode(B byteBuf, V packet, CallbackInfo ci, @Local(ordinal = 1) T packetType, @Local Exception e) { + public void encode(B byteBuf, V packet, CallbackInfo ci, @Local(name = "type") T packetType, @Local(name = "e") Exception e) { CustomPacketPayload payload = null; if (packet instanceof ServerboundCustomPayloadPacket customPayloadPacket) { diff --git a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/TerrainParticleMixin.java b/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/TerrainParticleMixin.java index 1e502a4c61..36d8892d92 100644 --- a/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/TerrainParticleMixin.java +++ b/fabric-particles-v1/src/client/java/net/fabricmc/fabric/mixin/client/particle/TerrainParticleMixin.java @@ -55,7 +55,8 @@ private TerrainParticleMixin() { from = @At(value = "FIELD", target = "Lnet/minecraft/client/particle/TerrainParticle;bCol:F", ordinal = 0, opcode = Opcodes.PUTFIELD), to = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;is(Ljava/lang/Object;)Z") ), - allow = 1 + allow = 1, + name = "blockState" ) private BlockState removeUntintableParticles(BlockState state, @Local(argsOnly = true) ClientLevel level, @Local(argsOnly = true) BlockPos blockPos) { if (!ParticleRenderEvents.ALLOW_TERRAIN_PARTICLE_TINT.invoker().allowTerrainParticleTint(state, level, blockPos)) { diff --git a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/EntityMixin.java b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/EntityMixin.java index e87e624e56..cd04893756 100644 --- a/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/EntityMixin.java +++ b/fabric-particles-v1/src/main/java/net/fabricmc/fabric/mixin/particle/EntityMixin.java @@ -30,8 +30,8 @@ @Mixin(Entity.class) abstract class EntityMixin { @ModifyExpressionValue(method = "spawnSprintParticle", at = @At(value = "NEW", target = "(Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/particles/BlockParticleOption;")) - private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original, @Local(ordinal = 0) BlockPos blockPos) { - ((BlockParticleOptionExtension) original).fabric_setBlockPos(blockPos); + private BlockParticleOption modifyBlockStateParticleOption(BlockParticleOption original, @Local(name = "pos") BlockPos pos) { + ((BlockParticleOptionExtension) original).fabric_setBlockPos(pos); return original; } } diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/RecipeMapMixin.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/RecipeMapMixin.java index 18f771123c..6dd8c88b84 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/RecipeMapMixin.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/mixin/recipe/sync/RecipeMapMixin.java @@ -57,12 +57,12 @@ private static void provideSerializerMap(Iterable> recipes, Call } @Inject(method = "create", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap$Builder;put(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableMap$Builder;")) - private static void fillSerializerMap(Iterable> recipes, CallbackInfoReturnable cir, @Local RecipeHolder entry, + private static void fillSerializerMap(Iterable> recipes, CallbackInfoReturnable cir, @Local(name = "recipe") RecipeHolder recipe, @Share("bySerializer") LocalRef, List>>> bySerializer) { - List> list = bySerializer.get().get(entry.value().getSerializer()); + List> list = bySerializer.get().get(recipe.value().getSerializer()); if (list != null) { - list.add(entry); + list.add(recipe); } } diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryPatchGeneratorMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryPatchGeneratorMixin.java index 2c7453194a..b0cbe546bb 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryPatchGeneratorMixin.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryPatchGeneratorMixin.java @@ -18,6 +18,7 @@ import java.util.List; +import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -29,7 +30,7 @@ @Mixin(RegistryPatchGenerator.class) class RegistryPatchGeneratorMixin { - @Redirect(at = @At(value = "FIELD", target = "Lnet/minecraft/resources/RegistryDataLoader;WORLDGEN_REGISTRIES:Ljava/util/List;"), method = "lambda$createLookup$0") + @Redirect(at = @At(value = "FIELD", target = "Lnet/minecraft/resources/RegistryDataLoader;WORLDGEN_REGISTRIES:Ljava/util/List;", opcode = Opcodes.GETSTATIC), method = "lambda$createLookup$0") private static List> getDynamicRegistries() { // Register cloners for all dynamic registries. return DynamicRegistries.getDynamicRegistries(); diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java index 6ca0c41290..63729feec8 100644 --- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java +++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/model/SimpleModelWrapperMixin.java @@ -54,7 +54,7 @@ abstract class SimpleModelWrapperMixin implements BlockModelPart { private boolean useAmbientOcclusion; @Inject(method = "bake(Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/resources/Identifier;Lnet/minecraft/client/resources/model/ModelState;)Lnet/minecraft/client/renderer/block/model/BlockModelPart;", at = @At(value = "INVOKE", target = "net/minecraft/client/resources/model/QuadCollection.getAll()Ljava/util/List;")) - private static void validateMeshAtlas(final ModelBaker modelBakery, final Identifier location, final ModelState state, CallbackInfoReturnable cir, @Local QuadCollection geometry, @Local LocalRef> forbiddenSpritesRef) { + private static void validateMeshAtlas(final ModelBaker modelBakery, final Identifier location, final ModelState state, CallbackInfoReturnable cir, @Local(name = "geometry") QuadCollection geometry, @Local(name = "forbiddenSprites") LocalRef> forbiddenSpritesRef) { if (geometry instanceof MeshQuadCollection meshGeometry) { meshGeometry.getMesh().forEach(quad -> { if (quad.atlas() != QuadAtlas.BLOCK) { diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/particle/ScreenEffectRendererMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/particle/ScreenEffectRendererMixin.java index f8f62de9b7..52e343b79c 100644 --- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/particle/ScreenEffectRendererMixin.java +++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/particle/ScreenEffectRendererMixin.java @@ -39,7 +39,7 @@ abstract class ScreenEffectRendererMixin { private static BlockPos pos; @Redirect(method = "renderScreenEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/block/BlockModelShaper;getParticleIcon(Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;")) - private static TextureAtlasSprite getParticleIconProxy(BlockModelShaper models, BlockState state, @Local Player player) { + private static TextureAtlasSprite getParticleIconProxy(BlockModelShaper models, BlockState state, @Local(name = "player") Player player) { if (pos != null) { TextureAtlasSprite sprite = models.getParticleIcon(state, player.level(), pos); pos = null; @@ -50,9 +50,9 @@ private static TextureAtlasSprite getParticleIconProxy(BlockModelShaper models, } @Inject(method = "getViewBlockingState", at = @At("RETURN")) - private static void onReturnGetInWallBlockState(CallbackInfoReturnable<@Nullable BlockState> cir, @Local BlockPos.MutableBlockPos mutable) { + private static void onReturnGetInWallBlockState(CallbackInfoReturnable<@Nullable BlockState> cir, @Local(name = "testPos") BlockPos.MutableBlockPos testPos) { if (cir.getReturnValue() != null) { - pos = mutable.immutable(); + pos = testPos.immutable(); } else { pos = null; } diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/ItemFrameRendererMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/ItemFrameRendererMixin.java index 2eff3c7c6b..501dc8c766 100644 --- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/ItemFrameRendererMixin.java +++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/ItemFrameRendererMixin.java @@ -34,9 +34,9 @@ abstract class ItemFrameRendererMixin { // Provide the BlockState as context. @Redirect(method = "submit(Lnet/minecraft/client/renderer/entity/state/ItemFrameRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/CameraRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SubmitNodeCollector;submitBlockModel(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/rendertype/RenderType;Lnet/minecraft/client/renderer/block/model/BlockStateModel;FFFIII)V")) - private void renderProxy(SubmitNodeCollector submitNodeCollector, PoseStack poseStack, RenderType renderType, BlockStateModel model, float r, float g, float b, int light, int overlay, int outlineColor, @Local BlockState blockState) { + private void renderProxy(SubmitNodeCollector submitNodeCollector, PoseStack poseStack, RenderType renderType, BlockStateModel model, float r, float g, float b, int light, int overlay, int outlineColor, @Local(name = "fakeBlockState") BlockState fakeBlockState) { // The vertex consumer is for a special layer that renders solid, but vanilla has no equivalent // cutout/translucent layers that we can use here without risking compatibility. - submitNodeCollector.submitBlockStateModel(poseStack, blockLayer -> renderType, model, r, g, b, light, overlay, outlineColor, EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, blockState); + submitNodeCollector.submitBlockStateModel(poseStack, blockLayer -> renderType, model, r, g, b, light, overlay, outlineColor, EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, fakeBlockState); } } diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/MushroomCowMushroomLayerMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/MushroomCowMushroomLayerMixin.java index 964ab273ae..ec980279f2 100644 --- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/MushroomCowMushroomLayerMixin.java +++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/MushroomCowMushroomLayerMixin.java @@ -34,7 +34,7 @@ abstract class MushroomCowMushroomLayerMixin { // Fix tinted quads being rendered completely black and provide the BlockState as context. @Redirect(method = "submitMushroomBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SubmitNodeCollector;submitBlockModel(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/rendertype/RenderType;Lnet/minecraft/client/renderer/block/model/BlockStateModel;FFFIII)V")) - private void renderProxy(SubmitNodeCollector submitNodeCollector, PoseStack poseStack, RenderType renderType, BlockStateModel model, float r, float g, float b, int light, int overlay, int outlineColor, @Local BlockState blockState) { + private void renderProxy(SubmitNodeCollector submitNodeCollector, PoseStack poseStack, RenderType renderType, BlockStateModel model, float r, float g, float b, int light, int overlay, int outlineColor, @Local(argsOnly = true) BlockState blockState) { submitNodeCollector.submitBlockStateModel(poseStack, _ -> renderType, model, 1, 1, 1, light, overlay, outlineColor, EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, blockState); } } diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SnowGolemHeadLayerMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SnowGolemHeadLayerMixin.java index 62998be3db..789791f7f1 100644 --- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SnowGolemHeadLayerMixin.java +++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/block/render/SnowGolemHeadLayerMixin.java @@ -36,14 +36,14 @@ @Mixin(SnowGolemHeadLayer.class) abstract class SnowGolemHeadLayerMixin { @Redirect(method = "submit(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;ILnet/minecraft/client/renderer/entity/state/SnowGolemRenderState;FF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/SubmitNodeCollector;submitBlockModel(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/rendertype/RenderType;Lnet/minecraft/client/renderer/block/model/BlockStateModel;FFFIII)V")) - private void renderProxy(SubmitNodeCollector submitNodeCollector, PoseStack poseStack, RenderType renderType, BlockStateModel model, float r, float g, float b, int light, int overlay, int outlineColor, @Local SnowGolemRenderState renderState, @Local BlockState blockState) { + private void renderProxy(SubmitNodeCollector submitNodeCollector, PoseStack poseStack, RenderType renderType, BlockStateModel model, float r, float g, float b, int light, int overlay, int outlineColor, @Local(argsOnly = true) SnowGolemRenderState renderState, @Local(name = "pumpkinBlockState") BlockState pumpkinBlockState) { // If true, the chunk layer is an outline chunk layer, and we want all geometry to use this chunk layer. if (renderState.appearsGlowing() && renderState.isInvisible) { // Fix tinted quads being rendered completely black and provide the BlockState as context. - submitNodeCollector.submitBlockStateModel(poseStack, _ -> renderType, model, 1, 1, 1, light, overlay, outlineColor, EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, blockState); + submitNodeCollector.submitBlockStateModel(poseStack, _ -> renderType, model, 1, 1, 1, light, overlay, outlineColor, EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, pumpkinBlockState); } else { // Support multi-chunk layer models, fix tinted quads being rendered completely black, and provide the BlockState as context. - submitNodeCollector.submitBlockStateModel(poseStack, ChunkSectionLayerHelper::getEntityBlockLayer, model, 1, 1, 1, light, overlay, outlineColor, EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, blockState); + submitNodeCollector.submitBlockStateModel(poseStack, ChunkSectionLayerHelper::getEntityBlockLayer, model, 1, 1, 1, light, overlay, outlineColor, EmptyBlockAndTintGetter.INSTANCE, BlockPos.ZERO, pumpkinBlockState); } } } diff --git a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/item/BlockModelWrapperMixin.java b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/item/BlockModelWrapperMixin.java index c5f04f2a2e..1197fe1469 100644 --- a/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/item/BlockModelWrapperMixin.java +++ b/fabric-renderer-api-v1/src/client/java/net/fabricmc/fabric/mixin/client/renderer/item/BlockModelWrapperMixin.java @@ -56,7 +56,7 @@ abstract class BlockModelWrapperMixin implements ItemModel, BlockModelWrapperExt private Mesh mesh; @Inject(method = "update", at = @At("RETURN")) - private void onReturnUpdate(final ItemStackRenderState output, final ItemStack item, final ItemModelResolver resolver, final ItemDisplayContext displayContext, final @Nullable ClientLevel level, final @Nullable ItemOwner owner, final int seed, CallbackInfo ci, @Local ItemStackRenderState.LayerRenderState layer) { + private void onReturnUpdate(final ItemStackRenderState output, final ItemStack item, final ItemModelResolver resolver, final ItemDisplayContext displayContext, final @Nullable ClientLevel level, final @Nullable ItemOwner owner, final int seed, CallbackInfo ci, @Local(name = "layer") ItemStackRenderState.LayerRenderState layer) { if (mesh != null) { // This logic matches that of ITEM_RENDER_TYPE_GETTER and BLOCK_RENDER_TYPE_GETTER ChunkSectionLayer defaultSectionLayer; diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/BlockRenderDispatcherMixin.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/BlockRenderDispatcherMixin.java index a970804117..e468eba800 100644 --- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/BlockRenderDispatcherMixin.java +++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/BlockRenderDispatcherMixin.java @@ -47,7 +47,7 @@ abstract class BlockRenderDispatcherMixin { private ModelBlockRenderer modelRenderer; @Inject(method = "renderBreakingTexture(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/BlockAndTintGetter;Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;)V", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/renderer/block/BlockModelShaper;getBlockModel(Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/block/model/BlockStateModel;"), cancellable = true) - private void afterGetModel(BlockState blockState, BlockPos blockPos, BlockAndTintGetter level, PoseStack poseStack, VertexConsumer vertexConsumer, CallbackInfo ci, @Local BlockStateModel model) { + private void afterGetModel(BlockState blockState, BlockPos blockPos, BlockAndTintGetter level, PoseStack poseStack, VertexConsumer vertexConsumer, CallbackInfo ci, @Local(name = "model") BlockStateModel model) { modelRenderer.render(level, model, blockState, blockPos, poseStack, layer -> vertexConsumer, true, blockState.getSeed(blockPos), OverlayTexture.NO_OVERLAY); ci.cancel(); diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemStackRenderStateMixin.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemStackRenderStateMixin.java index 6d20f4eac9..7518fbf6d2 100644 --- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemStackRenderStateMixin.java +++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/ItemStackRenderStateMixin.java @@ -38,12 +38,12 @@ @Mixin(ItemStackRenderState.class) abstract class ItemStackRenderStateMixin { @Inject(method = "visitExtents(Ljava/util/function/Consumer;)V", at = @At(value = "NEW", target = "com/mojang/blaze3d/vertex/PoseStack$Pose")) - private void afterInitVecLoad(Consumer posConsumer, CallbackInfo ci, @Local Vector3f vec, @Share("pipe") LocalRef pipeRef) { - pipeRef.set(new QuadToPosPipe(posConsumer, vec)); + private void afterInitVecLoad(Consumer posConsumer, CallbackInfo ci, @Local(name = "scratch") Vector3f scratch, @Share("pipe") LocalRef pipeRef) { + pipeRef.set(new QuadToPosPipe(posConsumer, scratch)); } @Inject(method = "visitExtents(Ljava/util/function/Consumer;)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack$Pose;setIdentity()V")) - private void afterLayerLoad(Consumer posConsumer, CallbackInfo ci, @Local(ordinal = 0) Vector3f vec, @Local ItemStackRenderState.LayerRenderState layer, @Local Matrix4f matrix, @Share("pipe") LocalRef pipeRef) { + private void afterLayerLoad(Consumer posConsumer, CallbackInfo ci, @Local(name = "scratch") Vector3f vec, @Local(name = "layer") ItemStackRenderState.LayerRenderState layer, @Local(name = "poseTransform") Matrix4f matrix, @Share("pipe") LocalRef pipeRef) { MutableMeshImpl mutableMesh = ((AccessLayerRenderState) layer).fabric_getMutableMesh(); if (mutableMesh.size() > 0) { diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/SectionCompilerMixin.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/SectionCompilerMixin.java index 21f78f8273..9705878dfe 100644 --- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/SectionCompilerMixin.java +++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/mixin/client/indigo/renderer/SectionCompilerMixin.java @@ -82,14 +82,14 @@ protected abstract BufferBuilder getOrBeginLayer( private void hookBuild(SectionPos sectionPos, RenderSectionRegion region, VertexSorting sorter, SectionBufferBuilderPack buffers, CallbackInfoReturnable cir, - @Local(ordinal = 0) BlockPos sectionOrigin, - @Local(ordinal = 0) PoseStack poseStack, - @Local(ordinal = 0) Map builderMap, - @Local(ordinal = 0) RandomSource random) { + @Local(name = "minPos") BlockPos minPos, + @Local(name = "poseStack") PoseStack poseStack, + @Local(name = "startedLayers") Map startedLayers, + @Local(name = "random") RandomSource random) { // hook just before iterating over the render chunk's blocks to capture the buffer builder map TerrainRenderContext renderer = TerrainRenderContext.POOL.get(); - renderer.prepare(region, sectionOrigin, - poseStack, random, layer -> getOrBeginLayer(builderMap, + renderer.prepare(region, minPos, + poseStack, random, layer -> getOrBeginLayer(startedLayers, buffers, layer)); ((AccessRenderSectionRegion) region).fabric_setRenderer(renderer); } @@ -108,12 +108,12 @@ private void hookBuild(SectionPos sectionPos, RenderSectionRegion region, Vertex * which was specifically created to provide for enhanced terrain rendering. */ @Redirect(method = "compile", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/state/BlockState;getRenderShape()Lnet/minecraft/world/level/block/RenderShape;")) - private RenderShape hookBuildRenderBlock(BlockState blockState, SectionPos sectionPos, RenderSectionRegion renderRegion, VertexSorting vertexSorter, SectionBufferBuilderPack buffers, @Local(ordinal = 2) BlockPos blockPos) { + private RenderShape hookBuildRenderBlock(BlockState blockState, SectionPos sectionPos, RenderSectionRegion renderRegion, VertexSorting vertexSorter, SectionBufferBuilderPack buffers, @Local(name = "pos") BlockPos pos) { RenderShape renderShape = blockState.getRenderShape(); if (renderShape == RenderShape.MODEL) { BlockStateModel model = blockRenderer.getBlockModel(blockState); - ((AccessRenderSectionRegion) renderRegion).fabric_getRenderer().bufferModel(model, blockState, blockPos); + ((AccessRenderSectionRegion) renderRegion).fabric_getRenderer().bufferModel(model, blockState, pos); return RenderShape.INVISIBLE; // Cancel the vanilla logic } diff --git a/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/LiquidBlockRendererMixin.java b/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/LiquidBlockRendererMixin.java index 652f097474..0e6f6977dd 100644 --- a/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/LiquidBlockRendererMixin.java +++ b/fabric-rendering-fluids-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/fluid/LiquidBlockRendererMixin.java @@ -108,7 +108,7 @@ private TextureAtlasSprite getOrDefault(int index, TextureAtlasSprite original) @ModifyVariable( method = "tesselate", at = @At("STORE"), - ordinal = 0 + name = "stillSprite" ) public TextureAtlasSprite modStill(TextureAtlasSprite original) { return getOrDefault(0, original); @@ -117,7 +117,7 @@ public TextureAtlasSprite modStill(TextureAtlasSprite original) { @ModifyVariable( method = "tesselate", at = @At("STORE"), - ordinal = 1 + name = "flowingSprite" ) public TextureAtlasSprite modFlowing(TextureAtlasSprite original) { return getOrDefault(1, original); @@ -142,20 +142,19 @@ public int modTintColor(int original, BlockAndTintGetter level, BlockPos pos, Ve method = "tesselate", at = @At(value = "MIXINEXTRAS:EXPRESSION", ordinal = 0), slice = @Slice(from = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/block/LiquidBlockRenderer;waterOverlay:Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;", opcode = Opcodes.GETFIELD)), - ordinal = 2 - ) + name = "sprite") private TextureAtlasSprite modifyOverlaySprite( TextureAtlasSprite waterOverlay, BlockAndTintGetter level, - @Local(ordinal = 1) BlockPos neighborPos, - @Local(ordinal = 0) boolean isLava, - @Local(ordinal = 1) TextureAtlasSprite flowingSprite, + @Local(name = "tPos") BlockPos tPos, + @Local(name = "isLava") boolean isLava, + @Local(name = "flowingSprite") TextureAtlasSprite flowingSprite, @Share("useOverlay") LocalBooleanRef useOverlay ) { final FluidRenderHandlerInfo info = FluidRenderingImpl.getCurrentInfo(); boolean hasOverlay = info.handler != null ? info.hasOverlay : !isLava; - Block neighborBlock = level.getBlockState(neighborPos).getBlock(); + Block neighborBlock = level.getBlockState(tPos).getBlock(); useOverlay.set(hasOverlay && FluidRenderHandlerRegistry.INSTANCE.isBlockTransparent(neighborBlock)); if (useOverlay.get()) { diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenOptionListMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenOptionListMixin.java index 39b798a687..3e0dd466f7 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenOptionListMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DebugOptionsScreenOptionListMixin.java @@ -38,7 +38,7 @@ private static int sort(Identifier o1, Identifier o2) { } @WrapOperation(method = "updateSearch", at = @At(value = "INVOKE", target = "Ljava/lang/String;contains(Ljava/lang/CharSequence;)Z")) - private boolean searchPath(String instance, CharSequence searchStrings, Operation original, @Local Map.Entry entry) { + private boolean searchPath(String instance, CharSequence searchStrings, Operation original, @Local(name = "entry") Map.Entry entry) { final String namespace = entry.getKey().getNamespace(); return original.call(instance, searchStrings) || (!Identifier.DEFAULT_NAMESPACE.equals(namespace) && namespace.contains(searchStrings)); diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderDispatcherMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderDispatcherMixin.java index e30fdf466b..38b13fd399 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderDispatcherMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/EntityRenderDispatcherMixin.java @@ -31,7 +31,7 @@ @Mixin(EntityRenderDispatcher.class) class EntityRenderDispatcherMixin { @Inject(method = "onResourceManagerReload", at = @At("TAIL")) - private void createArmorRenderers(ResourceManager manager, CallbackInfo ci, @Local EntityRendererProvider.Context context) { + private void createArmorRenderers(ResourceManager manager, CallbackInfo ci, @Local(name = "context") EntityRendererProvider.Context context) { ArmorRendererRegistryImpl.createArmorRenderers(context); } } diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java index beb3f1c05d..52c22f4b76 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/GuiRendererMixin.java @@ -93,7 +93,7 @@ private void postPrepareSpecialElements(CallbackInfo ci) { pipRendererPools.values().forEach(PictureInPictureRendererPool::cleanUpUnusedRenderers); } - @ModifyVariable(method = "preparePictureInPictureState", at = @At("STORE")) + @ModifyVariable(method = "preparePictureInPictureState", at = @At("STORE"), name = "renderer") private PictureInPictureRenderer substituteSpecialElementRenderer(PictureInPictureRenderer original, T elementState) { if (original == null || !hasFabricInitialized) { return original; diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LayerDefinitionsMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LayerDefinitionsMixin.java index e0b5c1cdd9..54e9fc7b5c 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LayerDefinitionsMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/LayerDefinitionsMixin.java @@ -36,13 +36,13 @@ @Mixin(LayerDefinitions.class) abstract class LayerDefinitionsMixin { @Inject(method = "createRoots", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableMap$Builder;build()Lcom/google/common/collect/ImmutableMap;")) - private static void registerExtraModelData(CallbackInfoReturnable> info, @Local ImmutableMap.Builder builder) { + private static void registerExtraModelData(CallbackInfoReturnable> info, @Local(name = "result") ImmutableMap.Builder result) { for (Map.Entry entry : ModelLayerImpl.PROVIDERS.entrySet()) { - builder.put(entry.getKey(), entry.getValue().createLayerDefinition()); + result.put(entry.getKey(), entry.getValue().createLayerDefinition()); } for (Map.Entry, ModelLayerRegistry.TexturedArmorModelSetProvider> entry : ModelLayerImpl.ARMOR_PROVIDERS.entrySet()) { - entry.getKey().putFrom(entry.getValue().createArmorModelSet(), builder); + entry.getKey().putFrom(entry.getValue().createArmorModelSet(), result); } } } diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java index 608f02b4d2..37b76705ef 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/PackMixin.java @@ -32,10 +32,10 @@ @Mixin(Pack.class) public class PackMixin { - @ModifyVariable(method = "readPackMetadata", at = @At("STORE")) - private static List applyOverlayConditions(List overlays, @Local PackResources resourcePack) throws IOException { + @ModifyVariable(method = "readPackMetadata", at = @At("STORE"), name = "overlaySet") + private static List applyOverlayConditions(List overlays, @Local(name = "pack") PackResources pack) throws IOException { List appliedOverlays = new ArrayList<>(overlays); - OverlayConditionsMetadata overlayMetadata = resourcePack.getMetadataSection(OverlayConditionsMetadata.SERIALIZER); + OverlayConditionsMetadata overlayMetadata = pack.getMetadataSection(OverlayConditionsMetadata.SERIALIZER); if (overlayMetadata != null) { appliedOverlays.addAll(overlayMetadata.appliedOverlays()); diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java index ac7e8ac459..f50bfc4bcf 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/RegistryLoadTaskPendingRegistrationMixin.java @@ -35,8 +35,8 @@ @Mixin(RegistryLoadTask.PendingRegistration.class) public abstract class RegistryLoadTaskPendingRegistrationMixin { @Inject(method = "loadFromResource", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Decoder;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;"), cancellable = true) - private static void loadFromResource(Decoder elementDecoder, RegistryOps ops, ResourceKey elementKey, Resource thunk, CallbackInfoReturnable> cir, @Local JsonElement jsonElement) { - if (jsonElement.isJsonObject() && !ResourceConditionsImpl.applyResourceConditions(jsonElement.getAsJsonObject(), elementKey.registry().toString(), elementKey.identifier(), ops.lookupProvider)) { + private static void loadFromResource(Decoder elementDecoder, RegistryOps ops, ResourceKey elementKey, Resource thunk, CallbackInfoReturnable> cir, @Local(name = "json") JsonElement json) { + if (json.isJsonObject() && !ResourceConditionsImpl.applyResourceConditions(json.getAsJsonObject(), elementKey.registry().toString(), elementKey.identifier(), ops.lookupProvider)) { cir.setReturnValue(Either.right(ResourceConditionsImpl.DISABLED_RESOURCE_EXCEPTION)); } } diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java index 47005e6909..e2a7a8c201 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/SimpleJsonResourceReloadListenerMixin.java @@ -49,7 +49,7 @@ public class SimpleJsonResourceReloadListenerMixin { @WrapOperation(method = "scanDirectory(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/FileToIdConverter;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;")) private static DataResult applyResourceConditions(Codec instance, DynamicOps dynamicOps, Object object, Operation> original, @Local(argsOnly = true) FileToIdConverter resourceFinder, - @Local Map.Entry entry) { + @Local(name = "entry") Map.Entry entry) { final JsonElement resourceData = (JsonElement) object; RegistryOps.@Nullable RegistryInfoLookup registryInfo = null; diff --git a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/CreateWorldScreenMixin.java b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/CreateWorldScreenMixin.java index b6b8daf27f..db3b977df9 100644 --- a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/CreateWorldScreenMixin.java +++ b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/CreateWorldScreenMixin.java @@ -19,6 +19,7 @@ import java.io.File; import com.mojang.datafixers.util.Pair; +import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -46,7 +47,8 @@ private CreateWorldScreenMixin() { } @ModifyVariable(method = "openCreateWorldScreen(Lnet/minecraft/client/Minecraft;Ljava/lang/Runnable;Ljava/util/function/Function;Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContextMapper;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldCallback;)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;createDefaultLoadConfig(Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/world/level/WorldDataConfiguration;)Lnet/minecraft/server/WorldLoader$InitConfig;")) + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;createDefaultLoadConfig(Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/world/level/WorldDataConfiguration;)Lnet/minecraft/server/WorldLoader$InitConfig;"), + name = "vanillaOnlyPackRepository") private static PackRepository onCreateResManagerInit(PackRepository manager) { // Add mod data packs to the initial res pack manager so they are active even if the user doesn't use custom data packs manager.sources.add(new ModResourcePackCreator(PackType.SERVER_DATA)); @@ -54,7 +56,7 @@ private static PackRepository onCreateResManagerInit(PackRepository manager) { } @Redirect(method = "openCreateWorldScreen(Lnet/minecraft/client/Minecraft;Ljava/lang/Runnable;Ljava/util/function/Function;Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContextMapper;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldCallback;)V", - at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/WorldDataConfiguration;DEFAULT:Lnet/minecraft/world/level/WorldDataConfiguration;", ordinal = 0)) + at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/WorldDataConfiguration;DEFAULT:Lnet/minecraft/world/level/WorldDataConfiguration;", ordinal = 0, opcode = Opcodes.GETSTATIC)) private static WorldDataConfiguration replaceDefaultSettings() { return ModPackResourcesUtil.createDefaultDataConfiguration(); } diff --git a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/GameOptionsWriteVisitorMixin.java b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/GameOptionsWriteVisitorMixin.java index 9f45d42734..17f2267fd2 100644 --- a/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/GameOptionsWriteVisitorMixin.java +++ b/fabric-resource-loader-v1/src/client/java/net/fabricmc/fabric/mixin/resource/client/GameOptionsWriteVisitorMixin.java @@ -53,7 +53,7 @@ private static List toPackListString(List packs) { @SuppressWarnings("unchecked") @ModifyArg(method = "process(Ljava/lang/String;Ljava/lang/Object;Ljava/util/function/Function;Ljava/util/function/Function;)Ljava/lang/Object;", at = @At(value = "INVOKE", target = "Ljava/util/function/Function;apply(Ljava/lang/Object;)Ljava/lang/Object;")) - private T skipHiddenPacks(T value, @Local String key) { + private T skipHiddenPacks(T value, @Local(argsOnly = true) String key) { if ("resourcePacks".equals(key) && value instanceof List) { return (T) toPackListString((List) value); } diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DataPackCommandMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DataPackCommandMixin.java index f58ea2d3e4..cf56dc9499 100644 --- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DataPackCommandMixin.java +++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DataPackCommandMixin.java @@ -62,7 +62,7 @@ private static Stream filterDisabledPackSuggestions(Stream instance, } @Inject(method = "getPack", at = @At(value = "INVOKE", target = "Ljava/util/Collection;contains(Ljava/lang/Object;)Z")) - private static void errorOnInternalPack(CommandContext context, String name, boolean enable, CallbackInfoReturnable cir, @Local Pack profile) throws CommandSyntaxException { - if (((FabricPack) profile).fabric$isHidden()) throw INTERNAL_PACK_EXCEPTION.create(profile.getId()); + private static void errorOnInternalPack(CommandContext context, String name, boolean enable, CallbackInfoReturnable cir, @Local(name = "pack") Pack pack) throws CommandSyntaxException { + if (((FabricPack) pack).fabric$isHidden()) throw INTERNAL_PACK_EXCEPTION.create(pack.getId()); } } diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DedicatedServerPropertiesMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DedicatedServerPropertiesMixin.java index 0c8108f2fc..eac9455975 100644 --- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DedicatedServerPropertiesMixin.java +++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/DedicatedServerPropertiesMixin.java @@ -16,6 +16,7 @@ package net.fabricmc.fabric.mixin.resource; +import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -27,7 +28,7 @@ @Mixin(DedicatedServerProperties.class) public class DedicatedServerPropertiesMixin { - @Redirect(method = "", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/WorldDataConfiguration;DEFAULT:Lnet/minecraft/world/level/WorldDataConfiguration;")) + @Redirect(method = "", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/WorldDataConfiguration;DEFAULT:Lnet/minecraft/world/level/WorldDataConfiguration;", opcode = Opcodes.GETSTATIC)) private WorldDataConfiguration replaceDefaultDataConfiguration() { return ModPackResourcesUtil.createDefaultDataConfiguration(); } diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackRepositoryMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackRepositoryMixin.java index e9f50299ec..ff8da80741 100644 --- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackRepositoryMixin.java +++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/PackRepositoryMixin.java @@ -84,23 +84,23 @@ public void construct(RepositorySource[] resourcePackProviders, CallbackInfo inf } @Inject(method = "rebuildSelected", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/ImmutableList;copyOf(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableList;")) - private void handleAutoEnableDisable(Collection enabledNames, CallbackInfoReturnable> cir, @Local List enabledAfterFirstRun) { - ModPackResourcesUtil.refreshAutoEnabledPacks(enabledAfterFirstRun, this.available); + private void handleAutoEnableDisable(Collection enabledNames, CallbackInfoReturnable> cir, @Local(name = "selectedAndPresent") List selectedAndPresent) { + ModPackResourcesUtil.refreshAutoEnabledPacks(selectedAndPresent, this.available); } @Inject(method = "addPack", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", shift = At.Shift.AFTER)) - private void handleAutoEnable(String profile, CallbackInfoReturnable cir, @Local List newlyEnabled) { + private void handleAutoEnable(String profile, CallbackInfoReturnable cir, @Local(name = "selectedCopy") List selectedCopy) { if (ModResourcePackCreator.POST_CHANGE_HANDLE_REQUIRED.contains(profile)) { - ModPackResourcesUtil.refreshAutoEnabledPacks(newlyEnabled, this.available); + ModPackResourcesUtil.refreshAutoEnabledPacks(selectedCopy, this.available); } } @Inject(method = "removePack", at = @At(value = "INVOKE", target = "Ljava/util/List;remove(Ljava/lang/Object;)Z")) - private void handleAutoDisable(String profile, CallbackInfoReturnable cir, @Local List enabled) { + private void handleAutoDisable(String profile, CallbackInfoReturnable cir, @Local(name = "selectedCopy") List selectedCopy) { if (ModResourcePackCreator.POST_CHANGE_HANDLE_REQUIRED.contains(profile)) { - Set currentlyEnabled = enabled.stream().map(Pack::getId).collect(Collectors.toSet()); - enabled.removeIf(p -> !((FabricPack) p).fabric$parentsEnabled(currentlyEnabled)); - LOGGER.debug("[Fabric] Internal pack auto-removed upon disabling {}, result: {}", profile, enabled.stream().map(Pack::getId).toList()); + Set currentlyEnabled = selectedCopy.stream().map(Pack::getId).collect(Collectors.toSet()); + selectedCopy.removeIf(p -> !((FabricPack) p).fabric$parentsEnabled(currentlyEnabled)); + LOGGER.debug("[Fabric] Internal pack auto-removed upon disabling {}, result: {}", profile, selectedCopy.stream().map(Pack::getId).toList()); } } } diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ReloadableServerResourcesMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ReloadableServerResourcesMixin.java index aea3fb9306..a020deeff0 100644 --- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ReloadableServerResourcesMixin.java +++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/ReloadableServerResourcesMixin.java @@ -52,12 +52,12 @@ private static List onSetupDataReloaders( List reloaders, @Local(argsOnly = true) ReloadableServerRegistries.LoadResult loadResult, @Local(argsOnly = true) FeatureFlagSet featureSet, - @Local ReloadableServerResources dataPackContents + @Local(name = "result") ReloadableServerResources result ) { var list = new ArrayList<>(reloaders); list.addFirst( new SetupMarkerResourceReloader( - dataPackContents, + result, loadResult.lookupWithUpdatedTags(), featureSet ) diff --git a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/SimpleReloadInstanceMixin.java b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/SimpleReloadInstanceMixin.java index 046606046b..cbd9bb5600 100644 --- a/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/SimpleReloadInstanceMixin.java +++ b/fabric-resource-loader-v1/src/main/java/net/fabricmc/fabric/mixin/resource/SimpleReloadInstanceMixin.java @@ -66,7 +66,8 @@ private static List sortProfiled(List recipe, CallbackInfo ci, @Local Direction direction, @Local Container inventory, @Local(ordinal = 1) ItemStack itemStack) { - if (inventory != null) { + private void transferOrSpawnStack(ServerLevel level, BlockPos pos, CrafterBlockEntity blockEntity, ItemStack inputStack, BlockState state, RecipeHolder recipe, CallbackInfo ci, @Local(name = "direction") Direction direction, @Local(name = "into") Container into, @Local(name = "remaining") ItemStack remaining) { + if (into != null) { // Vanilla already found and tested an inventory, nothing else to do even if it failed to insert. return; } - if (itemStack.isEmpty()) { + if (remaining.isEmpty()) { // Nothing left to do, in theory should never get here. return; } @@ -58,10 +58,10 @@ private void transferOrSpawnStack(ServerLevel level, BlockPos pos, CrafterBlockE if (target != null) { // Attempt to move the entire stack, and decrement the size of success moves. try (Transaction transaction = Transaction.openOuter()) { - long moved = target.insert(ItemVariant.of(itemStack), inputStack.getCount(), transaction); + long moved = target.insert(ItemVariant.of(remaining), inputStack.getCount(), transaction); if (moved > 0) { - itemStack.shrink((int) moved); + remaining.shrink((int) moved); transaction.commit(); } } diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java index 9bf046de84..899598585f 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/HopperBlockEntityMixin.java @@ -52,9 +52,9 @@ public class HopperBlockEntityMixin { method = "ejectItems", cancellable = true ) - private static void hookInsert(Level level, BlockPos pos, HopperBlockEntity blockEntity, CallbackInfoReturnable cir, @Local Container targetInventory) { + private static void hookInsert(Level level, BlockPos pos, HopperBlockEntity blockEntity, CallbackInfoReturnable cir, @Local(name = "container") Container container) { // Let vanilla handle the transfer if it found an inventory. - if (targetInventory != null) return; + if (container != null) return; // Otherwise inject our transfer logic. Direction direction = ((HopperBlockEntityMixin) (Object) blockEntity).facing; @@ -81,9 +81,9 @@ private static void hookInsert(Level level, BlockPos pos, HopperBlockEntity bloc method = "suckInItems(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/entity/Hopper;)Z", cancellable = true ) - private static void hookExtract(Level level, Hopper hopper, CallbackInfoReturnable cir, @Local Container inputInventory) { + private static void hookExtract(Level level, Hopper hopper, CallbackInfoReturnable cir, @Local(name = "container") Container container) { // Let vanilla handle the transfer if it found an inventory. - if (inputInventory != null) return; + if (container != null) return; // Otherwise inject our transfer logic. BlockPos sourcePos = BlockPos.containing(hopper.getLevelX(), hopper.getLevelY() + 1.0D, hopper.getLevelZ());