Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-02-03 23:41:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
FlorianMichael 2024-07-04 17:38:39 +02:00
parent ae5b490d6b
commit 969ca32624
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/item/MixinBucketItem.java
View File

@ -32,7 +32,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(BucketItem.class) @Mixin(BucketItem.class)
public abstract class MixinBucketItem { 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) { private ItemStack dontExchangeStack(ItemStack inputStack, PlayerEntity player, ItemStack outputStack) {
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_5)) { if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_20_5)) {
return inputStack; return inputStack;

2
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java
View File

@ -66,7 +66,7 @@ public abstract class MixinProtocolc0_30cpeToc0_28_30 extends AbstractProtocol<C
} }
@Inject(method = "init", at = @At("HEAD")) @Inject(method = "init", at = @At("HEAD"))
public void resetSnowing(CallbackInfo ci) { private void resetSnowing(CallbackInfo ci) {
CPEAdditions.setSnowing(false); CPEAdditions.setSnowing(false);
} }

2
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinBlockItemPacketRewriter1_20_5.java
View File

@ -72,7 +72,7 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
} }
@Inject(method = "<init>", at = @At("RETURN")) @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 // 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. // 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"); this.viaFabricPlus$foodItems_b1_7_3.add("minecraft:apple");

4
src/main/resources/viafabricplus.mixins.json
View File

@ -97,6 +97,7 @@
"fixes.minecraft.entity.MixinAbstractClientPlayerEntity", "fixes.minecraft.entity.MixinAbstractClientPlayerEntity",
"fixes.minecraft.entity.MixinAbstractHorseEntity", "fixes.minecraft.entity.MixinAbstractHorseEntity",
"fixes.minecraft.entity.MixinAnimalEntity", "fixes.minecraft.entity.MixinAnimalEntity",
"fixes.minecraft.entity.MixinArmadilloEntity",
"fixes.minecraft.entity.MixinAxolotlEntity", "fixes.minecraft.entity.MixinAxolotlEntity",
"fixes.minecraft.entity.MixinBipedEntityModel", "fixes.minecraft.entity.MixinBipedEntityModel",
"fixes.minecraft.entity.MixinBoatEntity", "fixes.minecraft.entity.MixinBoatEntity",
@ -203,8 +204,7 @@
"fixes.viaversion.MixinWorldPacketRewriter1_19", "fixes.viaversion.MixinWorldPacketRewriter1_19",
"viabedrock.MixinJoinPackets", "viabedrock.MixinJoinPackets",
"vialegacy.MixinExtensionProtocolMetadataStorage", "vialegacy.MixinExtensionProtocolMetadataStorage",
"vialegacy.MixinViaLegacyConfig", "vialegacy.MixinViaLegacyConfig"
"fixes.minecraft.entity.MixinArmadilloEntity"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1