Fix #3228 (finally)

This commit is contained in:
Vincent Lee committed 2020-04-04 12:48:52 -05:00
1 parent f8d7a2ad11
commit 0f2c8d61b6
10 files changed
+83 -50

No files matched your search

@@ -12,13 +12,18 @@ import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import org.lwjgl.opengl.GL11;
import vazkii.botania.common.network.PacketHandler;
import vazkii.botania.common.network.PacketUpdateItemsRemaining;
import javax.annotation.Nullable;
import java.util.regex.Pattern;
public final class ItemsRemainingRenderHandler {
@@ -27,7 +32,8 @@ public final class ItemsRemainingRenderHandler {
private static final int leaveTicks = 20;
private static ItemStack stack = ItemStack.EMPTY;
private static String customString;
@Nullable
private static ITextComponent customString;
private static int ticks, count;
@OnlyIn(Dist.CLIENT)
@@ -76,7 +82,7 @@ public final class ItemsRemainingRenderHandler {
}
}
} else {
text = customString;
text = customString.getFormattedText();
}
int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24;
@@ -94,22 +100,22 @@ public final class ItemsRemainingRenderHandler {
}
}
public static void set(ItemStack stack, String str) {
set(stack, 0, str);
public static void send(PlayerEntity player, ItemStack stack, int count) {
send(player, stack, count, null);
}
public static void set(ItemStack stack, int count) {
set(stack, count, null);
}
public static void set(ItemStack stack, int count, String str) {
public static void set(ItemStack stack, int count, @Nullable ITextComponent str) {
ItemsRemainingRenderHandler.stack = stack;
ItemsRemainingRenderHandler.count = count;
ItemsRemainingRenderHandler.customString = str;
ticks = stack.isEmpty() ? 0 : maxTicks;
}
public static void set(PlayerEntity player, ItemStack displayStack, Pattern pattern) {
public static void send(PlayerEntity entity, ItemStack stack, int count, @Nullable ITextComponent str) {
PacketHandler.sendTo((ServerPlayerEntity) entity, new PacketUpdateItemsRemaining(stack, count, str));
}
public static void send(PlayerEntity player, ItemStack displayStack, Pattern pattern) {
int count = 0;
for (int i = 0; i < player.inventory.getSizeInventory(); i++) {
ItemStack stack = player.inventory.getStackInSlot(i);
@@ -118,7 +124,7 @@ public final class ItemsRemainingRenderHandler {
}
}
set(displayStack, count);
send(player, displayStack, count, null);
}
}
@@ -22,7 +22,6 @@ import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.Direction.Axis;
import net.minecraft.util.Hand;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvents;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
@@ -84,11 +83,13 @@ public class ItemAstrolabe extends Item {
public ActionResult<ItemStack> onItemRightClick(World worldIn, PlayerEntity playerIn, @Nonnull Hand hand) {
ItemStack stack = playerIn.getHeldItem(hand);
if (playerIn.isSneaking()) {
int size = getSize(stack);
int newSize = size == 11 ? 3 : size + 2;
setSize(stack, newSize);
ItemsRemainingRenderHandler.set(stack, newSize + "x" + newSize);
worldIn.playSound(playerIn, playerIn.getPosition(), SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F);
playerIn.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.5F, 1F);
if (!worldIn.isRemote) {
int size = getSize(stack);
int newSize = size == 11 ? 3 : size + 2;
setSize(stack, newSize);
ItemsRemainingRenderHandler.send(playerIn, stack, 0, new StringTextComponent(newSize + "x" + newSize));
}
return ActionResult.success(stack);
}
@@ -245,7 +246,7 @@ public class ItemAstrolabe extends Item {
Block block = getBlock(stack);
int count = ItemExchangeRod.getInventoryItemCount(player, stack, block);
if (!player.world.isRemote) {
ItemsRemainingRenderHandler.set(new ItemStack(block), count);
ItemsRemainingRenderHandler.send(player, new ItemStack(block), count);
}
}
@@ -110,8 +110,10 @@ public class ItemBlackHoleTalisman extends Item implements IBlockProvider {
ActionResultType result = PlayerHelper.substituteUse(ctx, toUse);
if (result == ActionResultType.SUCCESS) {
remove(stack, 1);
ItemsRemainingRenderHandler.set(toUse, getBlockCount(stack));
if (!world.isRemote) {
remove(stack, 1);
ItemsRemainingRenderHandler.send(player, toUse, getBlockCount(stack));
}
return ActionResultType.SUCCESS;
}
}
@@ -80,10 +80,11 @@ public class ItemManaGun extends Item implements IManaUsingItem {
world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
if (world.isRemote) {
player.swingArm(hand);
} else {
ItemStack lens = getLens(stack);
ItemsRemainingRenderHandler.send(player, lens, -2);
stack.setDamage(effCd);
}
ItemStack lens = getLens(stack);
ItemsRemainingRenderHandler.set(lens, -2);
stack.setDamage(effCd);
return ActionResult.success(stack);
} else if (stack.getDamage() == 0) {
EntityManaBurst burst = getBurst(player, stack, true, hand);
@@ -64,7 +64,9 @@ public class ItemManasteelAxe extends AxeItem implements IManaUsingItem, ISortab
if (!stackAt.isEmpty() && SAPLING_PATTERN.matcher(stackAt.getItem().getTranslationKey()).find()) {
ItemStack displayStack = stackAt.copy();
if (PlayerHelper.substituteUse(ctx, stackAt) == ActionResultType.SUCCESS) {
ItemsRemainingRenderHandler.set(player, displayStack, SAPLING_PATTERN);
if (!ctx.getWorld().isRemote) {
ItemsRemainingRenderHandler.send(player, displayStack, SAPLING_PATTERN);
}
return ActionResultType.SUCCESS;
}
}
@@ -61,7 +61,9 @@ public class ItemManasteelPick extends PickaxeItem implements IManaUsingItem, IS
if (!stackAt.isEmpty() && TORCH_PATTERN.matcher(stackAt.getItem().getTranslationKey()).find()) {
ItemStack displayStack = stackAt.copy();
ActionResultType did = PlayerHelper.substituteUse(ctx, stackAt);
ItemsRemainingRenderHandler.set(player, displayStack, TORCH_PATTERN);
if (did == ActionResultType.SUCCESS && !ctx.getWorld().isRemote) {
ItemsRemainingRenderHandler.send(player, displayStack, TORCH_PATTERN);
}
return did;
}
}
@@ -331,7 +331,7 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC
Block block = getState(stack).getBlock();
int count = getInventoryItemCount(player, stack, block);
if (!player.world.isRemote) {
ItemsRemainingRenderHandler.set(new ItemStack(block), count);
ItemsRemainingRenderHandler.send(player, new ItemStack(block), count);
}
}
@@ -1,23 +0,0 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.common.network;
import java.util.function.IntSupplier;
public interface ILoginPacket extends IntSupplier {
void setLoginIndex(int index);
int getLoginIndex();
@Override
default int getAsInt() {
return getLoginIndex();
}
}
@@ -24,7 +24,7 @@ import net.minecraftforge.fml.network.simple.SimpleChannel;
import vazkii.botania.common.lib.LibMisc;
public final class PacketHandler {
private static final String PROTOCOL = "4";
private static final String PROTOCOL = "5";
public static final SimpleChannel HANDLER = NetworkRegistry.newSimpleChannel(
new ResourceLocation(LibMisc.MOD_ID, "chan"),
() -> PROTOCOL,
@@ -40,6 +40,7 @@ public final class PacketHandler {
HANDLER.registerMessage(id++, PacketJump.class, PacketJump::encode, PacketJump::decode, PacketJump::handle);
HANDLER.registerMessage(id++, PacketItemAge.class, PacketItemAge::encode, PacketItemAge::decode, PacketItemAge::handle);
HANDLER.registerMessage(id++, PacketIndexKeybindRequest.class, PacketIndexKeybindRequest::encode, PacketIndexKeybindRequest::decode, PacketIndexKeybindRequest::handle);
HANDLER.registerMessage(id++, PacketUpdateItemsRemaining.class, PacketUpdateItemsRemaining::encode, PacketUpdateItemsRemaining::decode, PacketUpdateItemsRemaining::handle);
}
/**
@@ -0,0 +1,41 @@
package vazkii.botania.common.network;
import net.minecraft.item.ItemStack;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.fml.LogicalSide;
import net.minecraftforge.fml.network.NetworkEvent;
import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler;
import javax.annotation.Nullable;
import java.util.function.Supplier;
public class PacketUpdateItemsRemaining {
private final ItemStack stack;
private final int count;
@Nullable
private final ITextComponent tooltip;
public PacketUpdateItemsRemaining(ItemStack stack, int count, @Nullable ITextComponent tooltip) {
this.stack = stack;
this.count = count;
this.tooltip = tooltip;
}
public static PacketUpdateItemsRemaining decode(PacketBuffer buf) {
return new PacketUpdateItemsRemaining(buf.readItemStack(), buf.readVarInt(), buf.readTextComponent());
}
public void encode(PacketBuffer buf) {
buf.writeItemStack(stack);
buf.writeVarInt(count);
buf.writeTextComponent(tooltip);
}
public void handle(Supplier<NetworkEvent.Context> ctx) {
if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
ctx.get().enqueueWork(() -> ItemsRemainingRenderHandler.set(stack, count, tooltip));
ctx.get().setPacketHandled(true);
}
}
}