From bd98cb587a84a6a6c60a5790b01f12808af1f145 Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Sun, 6 Nov 2022 22:13:21 -0500 Subject: [PATCH] Fix invalid field access after module merge --- .../inspirations/common/network/MilkablePacket.java | 5 +++-- .../java/knightminer/inspirations/tweaks/TweaksEvents.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/knightminer/inspirations/common/network/MilkablePacket.java b/src/main/java/knightminer/inspirations/common/network/MilkablePacket.java index a70d9392..3cbb4bb0 100644 --- a/src/main/java/knightminer/inspirations/common/network/MilkablePacket.java +++ b/src/main/java/knightminer/inspirations/common/network/MilkablePacket.java @@ -1,12 +1,13 @@ package knightminer.inspirations.common.network; -import knightminer.inspirations.common.CommonsEvents; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; import net.minecraftforge.network.NetworkEvent; import slimeknights.mantle.network.packet.IThreadsafePacket; +import static knightminer.inspirations.tweaks.TweaksEvents.TAG_MILKCOOLDOWN; + @SuppressWarnings("WeakerAccess") public class MilkablePacket implements IThreadsafePacket { @@ -46,7 +47,7 @@ private static void handle(MilkablePacket packet) { } // value for not milkable does not matter as long as its greater than 0 - entity.getPersistentData().putShort(CommonsEvents.TAG_MILKCOOLDOWN, (short)(packet.milkable ? 0 : 100)); + entity.getPersistentData().putShort(TAG_MILKCOOLDOWN, (short)(packet.milkable ? 0 : 100)); } } } diff --git a/src/main/java/knightminer/inspirations/tweaks/TweaksEvents.java b/src/main/java/knightminer/inspirations/tweaks/TweaksEvents.java index 40eb083d..79d198da 100644 --- a/src/main/java/knightminer/inspirations/tweaks/TweaksEvents.java +++ b/src/main/java/knightminer/inspirations/tweaks/TweaksEvents.java @@ -44,7 +44,7 @@ @SuppressWarnings({"unused"}) @EventBusSubscriber(modid = Inspirations.modID, bus = Bus.FORGE) public class TweaksEvents { - private static final String TAG_MILKCOOLDOWN = "milk_cooldown"; + public static final String TAG_MILKCOOLDOWN = "milk_cooldown"; @SubscribeEvent static void unsaddlePig(EntityInteract event) {