mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 07:56:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Added server-side check to BackTankUtil

Browse source 
- Added server-side check to BackTankUtil#isBarVisible, BackTankUtil#getBarWidth, BackTankUtil#getBarColor
- Fixes #3751
This commit is contained in:
caelwarner 2022-10-08 02:01:54 -07:00
parent 959aa4afbd
commit 0c5ccf38ee
Failed to generate hash of commit
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/simibubi/create/content/curiosities/armor/BackTankUtil.java
View file

@ -9,7 +9,6 @@ import com.simibubi.create.foundation.utility.Lang;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket; import net.minecraft.network.protocol.game.ClientboundSetSubtitleTextPacket;
@ -22,7 +21,7 @@ import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor;
public class BackTankUtil { public class BackTankUtil {
@ -105,11 +104,10 @@ public class BackTankUtil {
// For Air-using tools // For Air-using tools
@OnlyIn(Dist.CLIENT)
public static boolean isBarVisible(ItemStack stack, int usesPerTank) { public static boolean isBarVisible(ItemStack stack, int usesPerTank) {
if (usesPerTank == 0) if (usesPerTank == 0)
return false; return false;
LocalPlayer player = Minecraft.getInstance().player; Player player = DistExecutor.unsafeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
if (player == null) if (player == null)
return false; return false;
ItemStack backtank = get(player); ItemStack backtank = get(player);
@ -118,11 +116,10 @@ public class BackTankUtil {
return true; return true;
} }
@OnlyIn(Dist.CLIENT)
public static int getBarWidth(ItemStack stack, int usesPerTank) { public static int getBarWidth(ItemStack stack, int usesPerTank) {
if (usesPerTank == 0) if (usesPerTank == 0)
return 13; return 13;
LocalPlayer player = Minecraft.getInstance().player; Player player = DistExecutor.unsafeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
if (player == null) if (player == null)
return 13; return 13;
ItemStack backtank = get(player); ItemStack backtank = get(player);
@ -132,11 +129,10 @@ public class BackTankUtil {
.getBarWidth(backtank); .getBarWidth(backtank);
} }
@OnlyIn(Dist.CLIENT)
public static int getBarColor(ItemStack stack, int usesPerTank) { public static int getBarColor(ItemStack stack, int usesPerTank) {
if (usesPerTank == 0) if (usesPerTank == 0)
return 0; return 0;
LocalPlayer player = Minecraft.getInstance().player; Player player = DistExecutor.unsafeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
if (player == null) if (player == null)
return 0; return 0;
ItemStack backtank = get(player); ItemStack backtank = get(player);