From e51a60fbeab1776626091cab4f5000fb52f939ea Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 Jan 2017 14:55:11 -0600 Subject: [PATCH 01/14] Make getTileEntity safe from getActualState and getExtendedState, closes #1999 --- src/main/java/vazkii/botania/common/block/BlockAltar.java | 4 +++- .../botania/common/block/BlockFloatingSpecialFlower.java | 4 +++- .../java/vazkii/botania/common/block/BlockOpenCrate.java | 7 +++++-- .../java/vazkii/botania/common/block/BlockPlatform.java | 7 +++++-- .../vazkii/botania/common/block/BlockSpecialFlower.java | 4 +++- .../botania/common/block/decor/BlockFloatingFlower.java | 4 +++- .../java/vazkii/botania/common/block/mana/BlockPool.java | 4 +++- 7 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 7953b5cbd..bf5512d20 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -31,8 +31,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -103,7 +105,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity te = worldIn.getTileEntity(pos); + TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos);; if (te instanceof TileAltar) { TileAltar altar = (TileAltar) te; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index bd4311a17..d766a3b91 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -31,8 +31,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; @@ -75,7 +77,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = super.getExtendedState(state, world, pos); - TileEntity te = world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileFloatingSpecialFlower) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, ((TileFloatingSpecialFlower) te).subTileName); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index c68ede2b3..ed40ebe5d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -29,8 +29,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -88,8 +90,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - if (world.getTileEntity(pos) instanceof TileCraftCrate) { - TileCraftCrate tile = (TileCraftCrate) world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);; + if (te instanceof TileCraftCrate) { + TileCraftCrate tile = (TileCraftCrate) te; state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); } else { state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index ba0329166..985f9c7a3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -30,9 +30,11 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ChunkCache; import net.minecraft.world.Explosion; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; @@ -95,8 +97,9 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_WORLD, world) .withProperty(BotaniaStateProps.HELD_POS, pos); - if (world.getTileEntity(pos) instanceof TileCamo) { - TileCamo tile = (TileCamo) world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + if (te instanceof TileCamo) { + TileCamo tile = (TileCamo) te; return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_STATE, tile.camoState); } else { return state; diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index a9255933b..813dde8e8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -39,8 +39,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; @@ -145,7 +147,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Nonnull @Override public IExtendedBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); String id = BotaniaAPI.getSubTileStringMapping(clazz); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index c6fe1bd7b..10964dc85 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -34,8 +34,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IExtendedBlockState; @@ -125,7 +127,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = getActualState(state, world, pos); - TileEntity te = world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileFloatingFlower) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingFlower) te).getIslandType()); } else if (te instanceof TileFloatingSpecialFlower) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 6f112b1dd..07d4ed775 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -36,8 +36,10 @@ import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -103,7 +105,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);; if (te instanceof TilePool) { return state.withProperty(BotaniaStateProps.COLOR, ((TilePool) te).color); } else { From 685917dd32234f2742b06c781ca9cd48d8b637a3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 Jan 2017 14:57:08 -0600 Subject: [PATCH 02/14] Get rid of extra semicolons --- src/main/java/vazkii/botania/common/block/BlockAltar.java | 2 +- src/main/java/vazkii/botania/common/block/BlockOpenCrate.java | 2 +- src/main/java/vazkii/botania/common/block/mana/BlockPool.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index bf5512d20..e2590e1d4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -105,7 +105,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos);; + TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); if (te instanceof TileAltar) { TileAltar altar = (TileAltar) te; diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index ed40ebe5d..0de6ef094 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -90,7 +90,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);; + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileCraftCrate) { TileCraftCrate tile = (TileCraftCrate) te; state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 07d4ed775..236039278 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -105,7 +105,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);; + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TilePool) { return state.withProperty(BotaniaStateProps.COLOR, ((TilePool) te).color); } else { From 7fbefda8486ab1017485d009b64b4081139b9d0a Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 10 Jan 2017 09:35:58 -0600 Subject: [PATCH 03/14] Fix inconsistencies in life imbuer vs vanilla mob spawner. closes #2040 --- .../java/vazkii/botania/common/block/tile/TileSpawnerClaw.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 5de9611c7..3a6912c61 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -104,10 +104,11 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving)entity : null; entity.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, world.rand.nextFloat() * 360.0F, 0.0F); - if (entityliving == null || entityliving.getCanSpawnHere()) + if (entityliving == null || net.minecraftforge.event.ForgeEventFactory.canEntitySpawnSpawner(entityliving, logic.getSpawnerWorld(), (float)entity.posX, (float)entity.posY, (float)entity.posZ)) { if (randomEntity.getNbt().getSize() == 1 && randomEntity.getNbt().hasKey("id", 8) && entity instanceof EntityLiving) { + if (!net.minecraftforge.event.ForgeEventFactory.doSpecialSpawn(entityliving, logic.getSpawnerWorld(), (float)entity.posX, (float)entity.posY, (float)entity.posZ)) ((EntityLiving)entity).onInitialSpawn(world.getDifficultyForLocation(new BlockPos(entity)), null); } From 66420044a7c72b248455773863b580d9586505b9 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 11 Jan 2017 10:08:23 -0600 Subject: [PATCH 04/14] Fix terra plate not playing particles. Closes #2124 --- .../common/block/tile/TileTerraPlate.java | 46 +++++-------------- .../common/network/PacketBotaniaEffect.java | 37 ++++++++++++++- 2 files changed, 47 insertions(+), 36 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 6a8bbd0fe..d6d248539 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -35,6 +35,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; public class TileTerraPlate extends TileMod implements ISparkAttachable { @@ -71,6 +73,9 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public void update() { + if(world.isRemote) + return; + boolean removeMana = true; if(hasValidPlatform()) { @@ -88,10 +93,13 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { otherSpark.registerTransfer(spark); } } - if(mana > 0) - doParticles(); + if(mana > 0) { + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + PacketHandler.sendToNearby(world, getPos(), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.TERRA_PLATE, getPos().getX(), getPos().getY(), getPos().getZ())); + } - if(mana >= MAX_MANA && !worldObj.isRemote) { + if(mana >= MAX_MANA) { EntityItem item = items.get(0); for(EntityItem otherItem : items) if(otherItem != item) @@ -109,38 +117,6 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { recieveMana(-1000); } - void doParticles() { - if(worldObj.isRemote) { - int ticks = (int) (100.0 * ((double) getCurrentMana() / (double) MAX_MANA)); - - int totalSpiritCount = 3; - double tickIncrement = 360D / totalSpiritCount; - - int speed = 5; - double wticks = ticks * speed - tickIncrement; - - double r = Math.sin((ticks - 100) / 10D) * 2; - double g = Math.sin(wticks * Math.PI / 180 * 0.55); - - for(int i = 0; i < totalSpiritCount; i++) { - double x = pos.getX() + Math.sin(wticks * Math.PI / 180) * r + 0.5; - double y = pos.getY() + 0.25 + Math.abs(r) * 0.7; - double z = pos.getZ() + Math.cos(wticks * Math.PI / 180) * r + 0.5; - - wticks += tickIncrement; - float[] colorsfx = new float[] { - 0F, (float) ticks / (float) 100, 1F - (float) ticks / (float) 100 - }; - Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); - Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); - - if(ticks == 100) - for(int j = 0; j < 15; j++) - Botania.proxy.wispFX(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); - } - } - } - List getItems() { return worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 76417cd37..891803f2e 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -6,6 +6,7 @@ import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.EnumDyeColor; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; @@ -15,6 +16,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.tile.TileTerraPlate; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.core.helper.Vector3; @@ -240,6 +242,38 @@ public class PacketBotaniaEffect implements IMessage { break; } + case TERRA_PLATE: { + TileEntity te = world.getTileEntity(new BlockPos(message.x, message.y, message.z)); + if(te instanceof TileTerraPlate) { + int ticks = (int) (100.0 * ((double) ((TileTerraPlate) te).getCurrentMana() / (double) TileTerraPlate.MAX_MANA)); + + int totalSpiritCount = 3; + double tickIncrement = 360D / totalSpiritCount; + + int speed = 5; + double wticks = ticks * speed - tickIncrement; + + double r = Math.sin((ticks - 100) / 10D) * 2; + double g = Math.sin(wticks * Math.PI / 180 * 0.55); + + for(int i = 0; i < totalSpiritCount; i++) { + double x = message.x + Math.sin(wticks * Math.PI / 180) * r + 0.5; + double y = message.y + 0.25 + Math.abs(r) * 0.7; + double z = message.z + Math.cos(wticks * Math.PI / 180) * r + 0.5; + + wticks += tickIncrement; + float[] colorsfx = new float[] { + 0F, (float) ticks / (float) 100, 1F - (float) ticks / (float) 100 + }; + Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], 0.85F, (float)g * 0.05F, 0.25F); + Botania.proxy.wispFX(x, y, z, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.1F + 0.1F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, (float) (Math.random() - 0.5) * 0.05F, 0.9F); + + if(ticks == 100) + for(int j = 0; j < 15; j++) + Botania.proxy.wispFX(message.x + 0.5, message.y + 0.5, message.z + 0.5, colorsfx[0], colorsfx[1], colorsfx[2], (float) Math.random() * 0.15F + 0.15F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F, (float) (Math.random() - 0.5F) * 0.125F); + } + } + } } } }); @@ -259,7 +293,8 @@ public class PacketBotaniaEffect implements IMessage { ENCHANTER_CRAFT(0), ENCHANTER_DESTROY(0), ENTROPINNYUM(0), - BLACK_LOTUS_DISSOLVE(0); + BLACK_LOTUS_DISSOLVE(0), + TERRA_PLATE(0); private final int argCount; From 6d85ef225b10ecb8de7cacb6f36e01adb0d1a6c8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 16 Jan 2017 14:13:20 -0600 Subject: [PATCH 05/14] Fix gourmaryllis spamming packets, closes #2133. They also now give an auditory cue when they are ready to accept another piece of food --- .../common/block/subtile/generating/SubTileGourmaryllis.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 9c75af2a3..4ac8317cf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -19,6 +19,7 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.WorldServer; import vazkii.botania.api.lexicon.LexiconEntry; @@ -44,9 +45,10 @@ public class SubTileGourmaryllis extends SubTileGenerating { if(cooldown > -1) cooldown--; - if(cooldown == 0) { + if(cooldown == 0 && storedMana != 0) { mana = Math.min(getMaxMana(), mana + storedMana); storedMana = 0; + getWorld().playSound(null, supertile.getPos(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.BLOCKS, 1, 1); sync(); } From 8139acc8bf7a3511711203fed107a9d547017146 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:23:26 +0000 Subject: [PATCH 06/14] Fixed the Ring of Loki checking your offhand item and thus negating the cursor addition if you have no item in either hand. Closes #2136 --- .../java/vazkii/botania/common/item/relic/ItemLokiRing.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index e155858f5..2938ce902 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -29,6 +29,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -68,7 +69,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { EntityPlayer player = event.getEntityPlayer(); ItemStack lokiRing = getLokiRing(player); - if(lokiRing == null || player.worldObj.isRemote) + if(lokiRing == null || player.worldObj.isRemote || event.getHand() == EnumHand.OFF_HAND) return; int slot = -1; From 0786e9d43f53309a6071a0f9624bff1c1264f95c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:25:49 +0000 Subject: [PATCH 07/14] Who told you you could change mappings? :v --- src/main/java/vazkii/botania/common/block/BlockAltar.java | 2 +- .../botania/common/block/BlockFloatingSpecialFlower.java | 2 +- .../java/vazkii/botania/common/block/BlockOpenCrate.java | 2 +- .../java/vazkii/botania/common/block/BlockPlatform.java | 2 +- .../vazkii/botania/common/block/BlockSpecialFlower.java | 2 +- .../botania/common/block/decor/BlockFloatingFlower.java | 2 +- .../java/vazkii/botania/common/block/mana/BlockPool.java | 2 +- .../vazkii/botania/common/block/tile/TileTerraPlate.java | 6 +++--- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index e2590e1d4..481d74375 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -105,7 +105,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); + TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); if (te instanceof TileAltar) { TileAltar altar = (TileAltar) te; diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index d766a3b91..160ac7e0b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -77,7 +77,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = super.getExtendedState(state, world, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileFloatingSpecialFlower) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, ((TileFloatingSpecialFlower) te).subTileName); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index 0de6ef094..bdd05dcf1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -90,7 +90,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileCraftCrate) { TileCraftCrate tile = (TileCraftCrate) te; state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 985f9c7a3..50562ea27 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -97,7 +97,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_WORLD, world) .withProperty(BotaniaStateProps.HELD_POS, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileCamo) { TileCamo tile = (TileCamo) te; return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_STATE, tile.camoState); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 813dde8e8..3dc375e12 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -147,7 +147,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Nonnull @Override public IExtendedBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); String id = BotaniaAPI.getSubTileStringMapping(clazz); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 10964dc85..c7650f69c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -127,7 +127,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = getActualState(state, world, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileFloatingFlower) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingFlower) te).getIslandType()); } else if (te instanceof TileFloatingSpecialFlower) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 236039278..2bc9952fc 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -105,7 +105,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TilePool) { return state.withProperty(BotaniaStateProps.COLOR, ((TilePool) te).color); } else { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index d6d248539..034f9577a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -73,7 +73,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public void update() { - if(world.isRemote) + if(worldObj.isRemote) return; boolean removeMana = true; @@ -94,8 +94,8 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } } if(mana > 0) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); - PacketHandler.sendToNearby(world, getPos(), + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + PacketHandler.sendToNearby(worldObj, getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.TERRA_PLATE, getPos().getX(), getPos().getY(), getPos().getZ())); } From 30401e24156323c04460515df2b66306b8f03a59 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:32:20 +0000 Subject: [PATCH 08/14] Fixed crash on unequipping the Ring of Loki. --- .../java/vazkii/botania/common/item/relic/ItemLokiRing.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 2938ce902..3673c3401 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -232,6 +232,9 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } private static void setCursorList(ItemStack stack, List cursors) { + if(stack == null) + return; + NBTTagCompound cmp = new NBTTagCompound(); if(cursors != null) { int i = 0; From c5a00ba542062c9d2629a851042288203b579f4b Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:35:07 +0000 Subject: [PATCH 09/14] The Mana Enchanter now accepts floating flowers. Closes #2137 --- .../botania/common/core/handler/InternalMethodHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index d19dd7f50..8430f95fe 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -49,13 +49,17 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.api.subtile.ISpecialFlower; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.BlockModFlower; +import vazkii.botania.common.block.BlockSpecialFlower; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.decor.BlockFloatingFlower; import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.integration.corporea.WrappedDeepStorage; import vazkii.botania.common.integration.corporea.WrappedIInventory; @@ -257,7 +261,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public boolean isBotaniaFlower(World world, BlockPos pos) { Block block = world.getBlockState(pos).getBlock(); - return block == ModBlocks.flower || block == ModBlocks.shinyFlower || block == ModBlocks.specialFlower; + return block instanceof BlockModFlower || block instanceof BlockFloatingFlower || block instanceof ISpecialFlower; } @Override From 86bdfaa186c6bfe2dcfd3d235c6ded86b8f2bba1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:41:34 +0000 Subject: [PATCH 10/14] Fixed the livingwood bow not using 1.9 arrow priority and using arrows even if they have infinity. --- .../equipment/tool/bow/ItemLivingwoodBow.java | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index e5750af86..967e05202 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -104,17 +104,14 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel @Override public void onPlayerStoppedUsing(@Nonnull ItemStack stack, @Nonnull World world, EntityLivingBase shooter, int useTicks) { - - boolean isPlayer = shooter instanceof EntityPlayer; - EntityPlayer player = isPlayer ? (EntityPlayer) shooter : null; + EntityPlayer player = (EntityPlayer) shooter; // Begin copy modified ItemBow.onPlayerStoppedUsing - boolean flag = !isPlayer || canFire(stack, player); // Botania - Custom canFire check - ItemStack itemstack = getAmmo(shooter); + boolean flag = canFire(stack, player); // Botania - Custom canFire check + ItemStack itemstack = getAmmo(player); int i = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); // Botania - velocity multiplier - if(isPlayer) - i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, player, i, itemstack != null || flag); + i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, player, i, itemstack != null || flag); if (i < 0) return; if (itemstack != null || flag) @@ -128,7 +125,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel if (f >= 0.1D) { - boolean infinite = !isPlayer || player.capabilities.isCreativeMode || itemstack.getItem() instanceof ItemArrow && ((ItemArrow) itemstack.getItem()).isInfinite(itemstack, stack, player); + boolean infinite = player.capabilities.isCreativeMode || (itemstack.getItem() instanceof ItemArrow ? ((ItemArrow)itemstack.getItem()).isInfinite(itemstack, stack, player) : false); if (!world.isRemote) { @@ -174,10 +171,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel world.playSound(null, shooter.posX, shooter.posY, shooter.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); - // Botania - move ammo consumption into onFire (above) - - if(isPlayer) - player.addStat(StatList.getObjectUseStats(this)); + player.addStat(StatList.getObjectUseStats(this)); } } // End modified ItemBow.onPlayerStoppedUsing @@ -194,7 +188,8 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel void onFire(ItemStack bow, EntityLivingBase living, boolean infinity, EntityArrow arrow) { if(living instanceof EntityPlayerMP) { ToolCommons.damageItem(bow, 1, living, MANA_PER_DAMAGE); - if(((EntityPlayerMP) living).interactionManager.getGameType().isSurvivalOrAdventure()) + + if(((EntityPlayerMP) living).interactionManager.getGameType().isSurvivalOrAdventure() && !infinity) PlayerHelper.consumeAmmo((EntityPlayerMP) living, AMMO_FUNC); } } @@ -215,10 +210,19 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel return true; } - protected ItemStack getAmmo(EntityLivingBase shooter) { - if(shooter instanceof EntityPlayer) - return PlayerHelper.getAmmo((EntityPlayer) shooter, AMMO_FUNC); - else return new ItemStack(Items.ARROW); + private ItemStack getAmmo(EntityPlayer player) { + if(isArrow(player.getHeldItem(EnumHand.OFF_HAND))) + return player.getHeldItem(EnumHand.OFF_HAND); + else if(isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) + return player.getHeldItem(EnumHand.MAIN_HAND); + else for(int i = 0; i < player.inventory.getSizeInventory(); ++i) { + ItemStack itemstack = player.inventory.getStackInSlot(i); + + if (isArrow(itemstack)) + return itemstack; + } + + return null; } @SideOnly(Side.CLIENT) From f67e6f8209a79a8118c1128c19b862dca8e6947f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:53:09 +0000 Subject: [PATCH 11/14] Fixed the Key of the King's Law stacking portals together if the player is looking straight down. Closes #2122 --- .../vazkii/botania/common/item/relic/ItemKingKey.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index e9116af58..114cedb74 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -64,8 +64,14 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { int spawned = getWeaponsSpawned(stack); if(count != getMaxItemUseDuration(stack) && spawned < 20 && !living.worldObj.isRemote && (!(living instanceof EntityPlayer) || ManaItemHandler.requestManaExact(stack, (EntityPlayer) living, 150, true))) { - Vector3 look = new Vector3(living.getLookVec()).multiply(1, 0, 1).normalize().multiply(-2);; - + Vector3 look = new Vector3(living.getLookVec()).multiply(1, 0, 1); + + double playerRot = Math.toRadians(living.rotationYaw + 90); + if(look.x == 0 && look.z == 0) + look = new Vector3(Math.cos(playerRot), 0, Math.sin(playerRot)); + + look = look.normalize().multiply(-2); + int div = spawned / 5; int mod = spawned % 5; From 3013253c9036106a77b16aaa18a093c517914726 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:57:41 +0000 Subject: [PATCH 12/14] Fixed the Crafty Crate destroying items if there's a block under it. --- .../java/vazkii/botania/common/block/tile/TileCraftCrate.java | 4 ++-- 1 file changed, 2 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 2544e49d8..19a8ab067 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -105,7 +105,7 @@ public class TileCraftCrate extends TileOpenCrate { if (worldObj.isRemote) return; - if(craft(true) && canEject() || isFull()) + if(canEject() && isFull() && craft(true)) ejectAll(); int newSignal = 0; @@ -189,7 +189,7 @@ public class TileCraftCrate extends TileOpenCrate { @Override public boolean onWanded(World world, EntityPlayer player, ItemStack stack) { - if(!world.isRemote) { + if(!world.isRemote && canEject()) { craft(false); ejectAll(); } From 4d8039a76a1b7db4f1b6d4f5000b78ac70228da1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 16:58:58 +0000 Subject: [PATCH 13/14] Compiling is good. --- .../common/item/equipment/tool/bow/ItemCrystalBow.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java index 5f5046946..83e907908 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java @@ -45,10 +45,4 @@ public class ItemCrystalBow extends ItemLivingwoodBow { if(living instanceof EntityPlayer) ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) living, ARROW_COST / (infinity ? 2 : 1), false); } - - @Override - protected ItemStack getAmmo(EntityLivingBase player) { - return new ItemStack(Items.ARROW); - } - } From a11fdadba2c8444d9ee3f1081a87026a376e3c60 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 21 Jan 2017 17:43:51 +0000 Subject: [PATCH 14/14] build 340 --- build.properties | 4 ++-- version/1.10.2.txt | 2 +- web/changelog.txt | 12 ++++++++++++ web/versions.ini | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index 93d37e310..8b41c70b7 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Sun Nov 20 17:03:58 GMT 2016 +#Sat Jan 21 17:42:42 GMT 2017 mod_name=Botania cf_meta_version=1.10.2 forge_version=12.18.1.2076 @@ -7,5 +7,5 @@ dir_repo=./ mc_mappings=snapshot_20160518 version=r1.9 dir_output=../Build Output/Botania/ +build_number=341 mc_version=1.10.2 -build_number=340 diff --git a/version/1.10.2.txt b/version/1.10.2.txt index 26b6d3990..84cc279a6 100644 --- a/version/1.10.2.txt +++ b/version/1.10.2.txt @@ -1 +1 @@ -r1.9-339 \ No newline at end of file +r1.9-340 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 33eeb2ef0..194b0acbf 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,15 @@ +r1.9 340 +*Fixed a crash regarding tile entities and block states not playing together. (williewillus) +*Fixed crash on unequipping the Ring of Loki. +*Fixed the Crafty Crate destroying items if there's a block under it. +*Fixed the Gourmaryllis spamming packets and causing ridiculous network usage. (williewillus) +*Fixed the Key of the King's Law stacking portals together if the player is looking straight down. +*Fixed the Life Imbuer spawning mobs inside blocks. (williewillus) +*Fixed the livingwood bow not using 1.9 arrow priority and using arrows even if they have infinity. +*Fixed the Mana Enchanter not accepting floating flowers. +*Fixed the Ring of Loki checking your offhand item and thus negating the cursor addition if you have no item in either hand. +*Fixed the T.A. Plate not showing particles. (williewillus) +*The Gourmaryllis now plays a burp sound when it's done eating. (williewillus) r1.9 339 *Fixed a crash if a burst from a Manastorm Charge hits a mana container block. *Fixed a potential crash when crafting with baubles. diff --git a/web/versions.ini b/web/versions.ini index 5522501a5..e3f7597bf 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -290,4 +290,5 @@ r1.9-335=1.10.2 r1.9-336=1.10.2 r1.9-337=1.10.2 r1.9-338=1.10.2 -r1.9-339=1.10.2 \ No newline at end of file +r1.9-339=1.10.2 +r1.9-340=1.10.2 \ No newline at end of file