mirror of
https://github.com/ViaVersion/ViaFabricPlus.git
synced 2025-01-25 22:11:32 +01:00
Cleanup
This commit is contained in:
parent
ae5b490d6b
commit
969ca32624
@ -32,7 +32,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
@Mixin(BucketItem.class)
|
||||
public abstract class MixinBucketItem {
|
||||
|
||||
@Redirect(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemUsage;exchangeStack(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;"))
|
||||
@Redirect(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemUsage;exchangeStack(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;", ordinal = 1))
|
||||
private ItemStack dontExchangeStack(ItemStack inputStack, PlayerEntity player, ItemStack outputStack) {
|
||||
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_5)) {
|
||||
return inputStack;
|
||||
|
@ -66,7 +66,7 @@ public abstract class MixinProtocolc0_30cpeToc0_28_30 extends AbstractProtocol<C
|
||||
}
|
||||
|
||||
@Inject(method = "init", at = @At("HEAD"))
|
||||
public void resetSnowing(CallbackInfo ci) {
|
||||
private void resetSnowing(CallbackInfo ci) {
|
||||
CPEAdditions.setSnowing(false);
|
||||
}
|
||||
|
||||
|
@ -72,7 +72,7 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
|
||||
}
|
||||
|
||||
@Inject(method = "<init>", at = @At("RETURN"))
|
||||
public void loadItemMappings(Protocol1_20_3To1_20_5 protocol, CallbackInfo ci) {
|
||||
private void loadItemMappings(Protocol1_20_3To1_20_5 protocol, CallbackInfo ci) {
|
||||
// Technically it would be cleaner to split mapping loading into there respective protocols, but that will be impossible
|
||||
// in a clean way, so let's just wait for Via* to load all protocols and then load everything in here.
|
||||
this.viaFabricPlus$foodItems_b1_7_3.add("minecraft:apple");
|
||||
|
@ -97,6 +97,7 @@
|
||||
"fixes.minecraft.entity.MixinAbstractClientPlayerEntity",
|
||||
"fixes.minecraft.entity.MixinAbstractHorseEntity",
|
||||
"fixes.minecraft.entity.MixinAnimalEntity",
|
||||
"fixes.minecraft.entity.MixinArmadilloEntity",
|
||||
"fixes.minecraft.entity.MixinAxolotlEntity",
|
||||
"fixes.minecraft.entity.MixinBipedEntityModel",
|
||||
"fixes.minecraft.entity.MixinBoatEntity",
|
||||
@ -203,8 +204,7 @@
|
||||
"fixes.viaversion.MixinWorldPacketRewriter1_19",
|
||||
"viabedrock.MixinJoinPackets",
|
||||
"vialegacy.MixinExtensionProtocolMetadataStorage",
|
||||
"vialegacy.MixinViaLegacyConfig",
|
||||
"fixes.minecraft.entity.MixinArmadilloEntity"
|
||||
"vialegacy.MixinViaLegacyConfig"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
|
Loading…
Reference in New Issue
Block a user