From 55722f14bdf99b2ed8e0ed40e4f917968fec6064 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 3 Mar 2019 08:06:38 +0000 Subject: [PATCH 01/12] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 2ee4eff6e..b9a52b971 100644 --- a/contributors.properties +++ b/contributors.properties @@ -163,3 +163,4 @@ mecharm=14 studkid=3 brannie17=puredaisy byunni_rabbit=orechid +chimericdream=11 From 38e681c6678fb4d2bb7949478c25d4e7a1d21041 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 5 Mar 2019 07:14:14 +0000 Subject: [PATCH 02/12] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index b9a52b971..adcebb330 100644 --- a/contributors.properties +++ b/contributors.properties @@ -164,3 +164,4 @@ studkid=3 brannie17=puredaisy byunni_rabbit=orechid chimericdream=11 +megageil=15 From fac41a7817b233dbb679e1e31f0ed42fbae86172 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 6 Mar 2019 22:04:22 +0000 Subject: [PATCH 03/12] Update contributors.properties --- contributors.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors.properties b/contributors.properties index adcebb330..85de9fe65 100644 --- a/contributors.properties +++ b/contributors.properties @@ -152,7 +152,7 @@ pickbreaker=manastar mojmacz=11 eeveein=2 _flipz_=vinculotus -_neotron_=9 +neovangium=9 taciturasa=6 nachog2003=9 ewsmith=rafflowsia From f79c7ac3028a24fb57de0ca01110382cea489f59 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Mar 2019 21:54:26 -0600 Subject: [PATCH 04/12] Fix #2862 and clean up the code a bit too --- .../common/block/tile/TileEnchanter.java | 156 +++++++++--------- 1 file changed, 79 insertions(+), 77 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index db6274ce0..5b8fb7baa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -50,6 +50,7 @@ import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; @@ -140,6 +141,76 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl } } + private void gatherEnchants() { + if(!world.isRemote && stageTicks % 20 == 0) { + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); + boolean addedEnch = false; + + for(EntityItem entity : items) { + ItemStack item = entity.getItem(); + if(item.getItem() == Items.ENCHANTED_BOOK) { + NBTTagList enchants = ItemEnchantedBook.getEnchantments(item); + if(enchants.tagCount() > 0) { + NBTTagCompound enchant = enchants.getCompoundTagAt(0); + short enchantId = enchant.getShort("id"); + short enchantLvl = enchant.getShort("lvl"); + Enchantment ench = Enchantment.getEnchantmentByID(enchantId); + if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { + this.enchants.add(new EnchantmentData(ench, enchantLvl)); + world.playSound(null, pos, ModSounds.ding, SoundCategory.BLOCKS, 1F, 1F); + addedEnch = true; + break; + } + } + } + } + + if(!addedEnch) { + if(enchants.isEmpty()) + stage = State.IDLE; + else advanceStage(); + } + } + } + + private void gatherMana(EnumFacing.Axis axis) { + if(manaRequired == -1) { + manaRequired = 0; + for(EnchantmentData data : enchants) { + manaRequired += (int) + (5000F * ((15 - Math.min(15, data.enchantment.getRarity().getWeight())) + * 1.05F) + * ((3F + data.enchantmentLevel * data.enchantmentLevel) + * 0.25F) + * (0.9F + enchants.size() * 0.05F) + * (data.enchantment.isTreasureEnchantment() ? 1.25F : 1F)); + } + } else if(mana >= manaRequired) { + manaRequired = 0; + for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { + TileEntity te = world.getTileEntity(pos.add(pylon)); + if(te instanceof TilePylon) + ((TilePylon) te).activated = false; + } + + advanceStage(); + } else { + ISparkEntity spark = getAttachedSpark(); + if(spark != null) { + List sparkEntities = SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + for(ISparkEntity otherSpark : sparkEntities) { + if(spark == otherSpark) + continue; + + if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) + otherSpark.registerTransfer(spark); + } + } + if(stageTicks % 5 == 0) + sync(); + } + } + @Override public void update() { IBlockState state = world.getBlockState(getPos()); @@ -147,7 +218,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { TileEntity tile = world.getTileEntity(pos.add(pylon)); - if(tile != null && tile instanceof TilePylon) { + if(tile instanceof TilePylon) { ((TilePylon) tile).activated = stage == State.GATHER_MANA; if(stage == State.GATHER_MANA) ((TilePylon) tile).centerPos = pos; @@ -168,77 +239,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl } switch(stage) { - case GATHER_ENCHANTS : { // Get books - if(stageTicks % 20 == 0) { - List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); - int count = items.size(); - boolean addedEnch = false; - - if(count > 0 && !world.isRemote) { - for(EntityItem entity : items) { - ItemStack item = entity.getItem(); - if(item.getItem() == Items.ENCHANTED_BOOK) { - NBTTagList enchants = ItemEnchantedBook.getEnchantments(item); - if(enchants.tagCount() > 0) { - NBTTagCompound enchant = enchants.getCompoundTagAt(0); - short enchantId = enchant.getShort("id"); - short enchantLvl = enchant.getShort("lvl"); - Enchantment ench = Enchantment.getEnchantmentByID(enchantId); - if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { - this.enchants.add(new EnchantmentData(ench, enchantLvl)); - world.playSound(null, pos, ModSounds.ding, SoundCategory.BLOCKS, 1F, 1F); - addedEnch = true; - break; - } - } - } - } - } - - if(!addedEnch) { - if(enchants.isEmpty()) - stage = State.IDLE; - else advanceStage(); - } - } - break; - } - case GATHER_MANA : { // Get Mana - if(manaRequired == -1) { - manaRequired = 0; - for(EnchantmentData data : enchants) { - manaRequired += (int) - (5000F * ((15 - Math.min(15, data.enchantment.getRarity().getWeight())) - * 1.05F) - * ((3F + data.enchantmentLevel * data.enchantmentLevel) - * 0.25F) - * (0.9F + enchants.size() * 0.05F) - * (data.enchantment.isTreasureEnchantment() ? 1.25F : 1F)); - } - } else if(mana >= manaRequired) { - manaRequired = 0; - for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) - ((TilePylon) world.getTileEntity(pos.add(pylon))).activated = false; - - advanceStage(); - } else { - ISparkEntity spark = getAttachedSpark(); - if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - for(ISparkEntity otherSpark : sparkEntities) { - if(spark == otherSpark) - continue; - - if(otherSpark.getAttachedTile() != null && otherSpark.getAttachedTile() instanceof IManaPool) - otherSpark.registerTransfer(spark); - } - } - if(stageTicks % 5 == 0) - sync(); - } - - break; - } + case GATHER_ENCHANTS : gatherEnchants(); break; + case GATHER_MANA : gatherMana(axis); break; case DO_ENCHANT : { // Enchant if(stageTicks >= 100) { for(EnchantmentData data : enchants) @@ -346,8 +348,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl NBTTagCompound itemCmp = new NBTTagCompound(); if(!itemToEnchant.isEmpty()) - itemCmp = itemToEnchant.writeToNBT(itemCmp); - cmp.setTag(TAG_ITEM, itemCmp); + cmp.setTag(TAG_ITEM, itemToEnchant.writeToNBT(itemCmp)); String enchStr = enchants.stream() .map(e -> Enchantment.REGISTRY.getNameForObject(e.enchantment) + "=" + e.enchantmentLevel) @@ -374,7 +375,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl String[] entryTokens = token.split("="); Enchantment ench = Enchantment.getEnchantmentByLocation(entryTokens[0]); int lvl = Integer.parseInt(entryTokens[1]); - enchants.add(new EnchantmentData(ench, lvl)); + if(ench != null) + enchants.add(new EnchantmentData(ench, lvl)); } } } @@ -387,8 +389,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl return false; } - private boolean isEnchantmentValid(Enchantment ench) { - if(!ench.canApply(itemToEnchant)) + private boolean isEnchantmentValid(@Nullable Enchantment ench) { + if(ench == null || !ench.canApply(itemToEnchant)) return false; for(EnchantmentData data : enchants) { From 88bc2b736a57f099dbbb8ea3aad14892e2847ab5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Mar 2019 22:26:14 -0600 Subject: [PATCH 05/12] Fix #2620 by syncing item ages to client --- .../subtile/functional/SubTileDaffomill.java | 14 ++++++ .../botania/common/network/PacketHandler.java | 1 + .../botania/common/network/PacketItemAge.java | 47 +++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/network/PacketItemAge.java diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 8cb36a7bf..244700f6f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -14,17 +14,22 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.event.entity.player.PlayerEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.Botania; import vazkii.botania.common.lexicon.LexiconData; +import vazkii.botania.common.network.PacketHandler; +import vazkii.botania.common.network.PacketItemAge; import java.util.List; @@ -158,4 +163,13 @@ public class SubTileDaffomill extends SubTileFunctional { windTicks = cmp.getInteger(TAG_WIND_TICKS); } + // Send item age to client to prevent client desync when an item is e.g. dropped by a powered open crate + @SubscribeEvent + public static void onItemTrack(PlayerEvent.StartTracking evt) { + if(evt.getTarget() instanceof EntityItem) { + int entityId = evt.getTarget().getEntityId(); + int age = ((EntityItem) evt.getTarget()).age; + PacketHandler.sendTo((EntityPlayerMP) evt.getEntityPlayer(), new PacketItemAge(entityId, age)); + } + } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 838f50a63..91c1e4834 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -21,6 +21,7 @@ public final class PacketHandler { HANDLER.registerMessage(PacketLeftClick.Handler.class, PacketLeftClick.class, id++, Side.SERVER); HANDLER.registerMessage(PacketDodge.Handler.class, PacketDodge.class, id++, Side.SERVER); HANDLER.registerMessage(PacketJump.Handler.class, PacketJump.class, id++, Side.SERVER); + HANDLER.registerMessage(PacketItemAge.Handler.class, PacketItemAge.class, id++, Side.CLIENT); } /** diff --git a/src/main/java/vazkii/botania/common/network/PacketItemAge.java b/src/main/java/vazkii/botania/common/network/PacketItemAge.java new file mode 100644 index 000000000..8dc08cb13 --- /dev/null +++ b/src/main/java/vazkii/botania/common/network/PacketItemAge.java @@ -0,0 +1,47 @@ +package vazkii.botania.common.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraftforge.fml.common.network.ByteBufUtils; +import net.minecraftforge.fml.common.network.simpleimpl.IMessage; +import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; +import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; + +public class PacketItemAge implements IMessage { + private int entityId; + private int age; + + public PacketItemAge() {} + + public PacketItemAge(int entityId, int age) { + this.entityId = entityId; + this.age = age; + } + + @Override + public void fromBytes(ByteBuf buf) { + entityId = ByteBufUtils.readVarInt(buf, 5); + age = ByteBufUtils.readVarInt(buf, 5); + } + + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeVarInt(buf, entityId, 5); + ByteBufUtils.writeVarInt(buf, age, 5); + } + + public static class Handler implements IMessageHandler { + @Override + public IMessage onMessage(PacketItemAge message, MessageContext ctx) { + Minecraft.getMinecraft().addScheduledTask(() -> { + Entity e = Minecraft.getMinecraft().world.getEntityByID(message.entityId); + if(e instanceof EntityItem) { + ((EntityItem) e).age = message.age; + } + }); + return null; + } + } +} From 775166125298e1af118f574192750496c8479a3e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 9 Mar 2019 12:13:01 +0000 Subject: [PATCH 06/12] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index 85de9fe65..abef45500 100644 --- a/contributors.properties +++ b/contributors.properties @@ -165,3 +165,5 @@ brannie17=puredaisy byunni_rabbit=orechid chimericdream=11 megageil=15 +krystal_disc=dandelifeon +floraltigress=pollidisiac From e27d994458cbb9f855b0b661acb3b495d220e4ff Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 9 Mar 2019 12:56:53 +0000 Subject: [PATCH 07/12] Update contributors.properties --- contributors.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors.properties b/contributors.properties index abef45500..db1f8eac0 100644 --- a/contributors.properties +++ b/contributors.properties @@ -164,6 +164,6 @@ studkid=3 brannie17=puredaisy byunni_rabbit=orechid chimericdream=11 -megageil=15 +albedox=15 krystal_disc=dandelifeon floraltigress=pollidisiac From b5702044713f93037bef0b67eeb1eaf9c530001c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 19 Mar 2019 20:31:15 +0000 Subject: [PATCH 08/12] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index db1f8eac0..be9e57b4a 100644 --- a/contributors.properties +++ b/contributors.properties @@ -167,3 +167,5 @@ chimericdream=11 albedox=15 krystal_disc=dandelifeon floraltigress=pollidisiac +callmejessica=3 +sefz=fallenkanade From 13598c3c0ac8f552e41b61b6048d3bb3a98f5dfb Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 25 Mar 2019 17:17:53 +0000 Subject: [PATCH 09/12] Update contributors.properties --- contributors.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors.properties b/contributors.properties index be9e57b4a..b9d9dfb24 100644 --- a/contributors.properties +++ b/contributors.properties @@ -167,5 +167,5 @@ chimericdream=11 albedox=15 krystal_disc=dandelifeon floraltigress=pollidisiac -callmejessica=3 +veritydev=3 sefz=fallenkanade From 1701732aaccb02279b64ceeef3d6a0c0409a3bf5 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Mar 2019 20:13:23 -0500 Subject: [PATCH 10/12] Fix improper usage of zero-sized stacks. Closes #2878 --- src/main/java/vazkii/botania/api/BotaniaAPI.java | 2 +- .../java/vazkii/botania/api/internal/DummyMethodHandler.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 8f8ac7812..9475cbbf9 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -351,7 +351,7 @@ public final class BotaniaAPI { return false; if(stack.getItemDamage() != Short.MAX_VALUE) { - ItemStack copy = new ItemStack(stack.getItem(), 0, Short.MAX_VALUE); + ItemStack copy = new ItemStack(stack.getItem(), 1, Short.MAX_VALUE); boolean general = isItemBlacklistedFromMagnet(copy, recursion + 1); if(general) return true; diff --git a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java index cd324f0b8..2b956fca7 100644 --- a/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java +++ b/src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java @@ -120,7 +120,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { @Override public ItemStack getSubTileAsStack(String subTile) { - return new ItemStack(Blocks.STONE, 0, 0); + return ItemStack.EMPTY; } @Override @@ -156,7 +156,7 @@ public class DummyMethodHandler implements IInternalMethodHandler { @Override public ItemStack getBindDisplayForFlowerType(SubTileEntity e) { - return new ItemStack(Blocks.STONE, 0, 0); + return ItemStack.EMPTY; } @Override From 49d52b4a85e84eeb0d5307c2052da8e60976b87a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 27 Mar 2019 20:16:58 -0500 Subject: [PATCH 11/12] Fix #2875 --- src/main/java/vazkii/botania/common/item/ItemGrassHorn.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 0e9f66752..c22285d1c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -107,7 +107,6 @@ public class ItemGrassHorn extends ItemMod { public static void breakGrass(World world, ItemStack stack, int stackDmg, BlockPos srcPos) { EnumHornType type = EnumHornType.getTypeForMeta(stackDmg); - Random rand = new Random(srcPos.hashCode()); int range = 12 - stackDmg * 3; int rangeY = 3 + stackDmg * 4; List coords = new ArrayList<>(); @@ -122,7 +121,7 @@ public class ItemGrassHorn extends ItemMod { coords.add(pos); } - Collections.shuffle(coords, rand); + Collections.shuffle(coords, world.rand); int count = Math.min(coords.size(), 32 + stackDmg * 16); for(int i = 0; i < count; i++) { From 2a27264b2212162e87e6c3ad08e471ad8eff13a3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 1 Apr 2019 17:08:04 -0500 Subject: [PATCH 12/12] uhhhhhhh oops --- .../vazkii/botania/common/block/tile/TileCraftCrate.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 106af51f6..693bdf0ff 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -145,8 +145,11 @@ public class TileCraftCrate extends TileOpenCrate { List remainders = recipe.getRemainingItems(craft); for(int i = 0; i < craft.getSizeInventory(); i++) { ItemStack s = remainders.get(i); - if(!s.isEmpty()) - itemHandler.setStackInSlot(i, s); + if(!itemHandler.getStackInSlot(i).isEmpty() + && itemHandler.getStackInSlot(i).getItem() == ModItems.manaResource + && itemHandler.getStackInSlot(i).getItemDamage() == 11) + continue; + itemHandler.setStackInSlot(i, s); } return true; }