-
Notifications
You must be signed in to change notification settings - Fork 382
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix jukebox state getting changed mid-transaction (#3693)
* fix jukebox state getting changed mid-transaction (#3517) * fix mixin --------- Co-authored-by: deirn <deirn@bai.lol>
- Loading branch information
Showing
3 changed files
with
82 additions
and
0 deletions.
There are no files selected for viewing
61 changes: 61 additions & 0 deletions
61
...sfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/JukeboxBlockEntityMixin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
* Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package net.fabricmc.fabric.mixin.transfer; | ||
|
||
import org.spongepowered.asm.mixin.Final; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.Shadow; | ||
import org.spongepowered.asm.mixin.Unique; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
||
import net.minecraft.block.entity.JukeboxBlockEntity; | ||
import net.minecraft.inventory.SingleStackInventory; | ||
import net.minecraft.item.ItemStack; | ||
import net.minecraft.util.collection.DefaultedList; | ||
|
||
import net.fabricmc.fabric.impl.transfer.item.SpecialLogicInventory; | ||
|
||
@Mixin(JukeboxBlockEntity.class) | ||
abstract class JukeboxBlockEntityMixin implements SpecialLogicInventory, SingleStackInventory { | ||
@Shadow | ||
@Final | ||
private DefaultedList<ItemStack> inventory; | ||
@Unique | ||
private boolean fabric_suppressSpecialLogic = false; | ||
|
||
@Override | ||
public void fabric_setSuppress(boolean suppress) { | ||
fabric_suppressSpecialLogic = suppress; | ||
} | ||
|
||
@Inject(method = "setStack", at = @At("HEAD"), cancellable = true) | ||
private void setStackBypass(int slot, ItemStack stack, CallbackInfo ci) { | ||
if (fabric_suppressSpecialLogic) { | ||
inventory.set(0, stack); | ||
ci.cancel(); | ||
} | ||
} | ||
|
||
@Override | ||
public void fabric_onFinalCommit(int slot, ItemStack oldStack, ItemStack newStack) { | ||
// Call setStack again without suppressing vanilla logic, | ||
// where now the record will actually getting played/stopped. | ||
setStack(newStack); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters