From 10ac3c3067db14f33ab132c33e42aa0af6d4ef27 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 2 Feb 2020 22:51:06 +0100 Subject: [PATCH 01/24] Fix empty prisms allowing warped bursts to transfer mana --- .../java/vazkii/botania/common/entity/EntityManaBurst.java | 4 ++++ src/main/java/vazkii/botania/common/item/lens/Lens.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index dac330689..073b4547e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -58,6 +58,7 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; +import vazkii.botania.common.item.lens.LensWarp; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -570,6 +571,9 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { } private void onRecieverImpact(IManaReceiver tile, BlockPos pos) { + if (getPersistentData().getBoolean(LensWarp.TAG_WARPED)) + return; + ILensEffect lens = getLensInstance(); int mana = getMana(); diff --git a/src/main/java/vazkii/botania/common/item/lens/Lens.java b/src/main/java/vazkii/botania/common/item/lens/Lens.java index 92ea31083..cb35550eb 100644 --- a/src/main/java/vazkii/botania/common/item/lens/Lens.java +++ b/src/main/java/vazkii/botania/common/item/lens/Lens.java @@ -37,7 +37,7 @@ public class Lens { public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {} public int getManaToTransfer(IManaBurst burst, ThrowableEntity entity, ItemStack stack, IManaReceiver receiver) { - return entity.getPersistentData().getBoolean(LensWarp.TAG_WARPED) ? 0 : burst.getMana(); + return burst.getMana(); } } From 9006e7c7959e71a5e45a6c2f165d2c3fd64cb816 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 4 Feb 2020 16:58:47 -0600 Subject: [PATCH 02/24] Fix #3161 flight bar drained by creative/spectator --- .../botania/common/item/equipment/bauble/ItemFlightTiara.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index c267255f6..5377472d5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -257,7 +257,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { Vector3 look = new Vector3(p.getLookVec()).multiply(1, 0, 1).normalize(); if(flying) { - if(time > 0 && !ItemNBTHelper.getBoolean(stack, TAG_INFINITE_FLIGHT, false)) + if(time > 0 && !p.isSpectator() && !p.isCreative() + && !ItemNBTHelper.getBoolean(stack, TAG_INFINITE_FLIGHT, false)) newTime--; final int maxCd = 80; int cooldown = ItemNBTHelper.getInt(stack, TAG_DASH_COOLDOWN, 0); From 607c58197052816ef9fa814154c9f1ebaeb529d2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 4 Feb 2020 17:32:19 -0600 Subject: [PATCH 03/24] Bump Patchouli --- build.gradle | 2 +- src/main/resources/META-INF/mods.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9f4179217..7603909fd 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,7 @@ repositories { dependencies { minecraft "net.minecraftforge:forge:${mc_version}-28.1.92" - compile fg.deobf("vazkii.patchouli:Patchouli:1.1-25.126") { transitive = false } + compile fg.deobf("vazkii.patchouli:Patchouli:1.14.4-1.1-25.135") { transitive = false } compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11:api") runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.11") diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index ee1bf6366..cb458dc11 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -23,7 +23,7 @@ Botania is a mod that adds nature magic to Minecraft''' [[dependencies.botania]] modId="patchouli" mandatory=true - versionRange="[1.1-22,)" + versionRange="[1.14.4-1.1-25,)" side="BOTH" [[dependencies.botania]] From d49fba9abc8c953ff75365c4c0eb379e00bdbd25 Mon Sep 17 00:00:00 2001 From: Hubry Date: Wed, 5 Feb 2020 00:38:24 +0100 Subject: [PATCH 04/24] Fix redirect lens pointing at 0,0,0, closes #3167 --- src/main/java/vazkii/botania/common/item/lens/LensRedirect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index 5bae4f2d0..935339c1e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -43,7 +43,7 @@ public class LensRedirect extends Lens { VoxelShape collideShape = entity.world.getBlockState(coords).getCollisionShape(entity.world, coords); if(collideShape.isEmpty()) axis = new AxisAlignedBB(coords, coords.add(1, 1, 1)); - else axis = collideShape.getBoundingBox(); // todo 1.13 more granular collisions? + else axis = collideShape.getBoundingBox().offset(coords); // todo 1.13 more granular collisions? if(!sourceVec.isInside(axis)) sourceVec = new Vector3(axis.minX + (axis.maxX - axis.minX) / 2, axis.minY + (axis.maxY - axis.minY) / 2, axis.minZ + (axis.maxZ - axis.minZ) / 2); From 4185fac8d6e4efb7ef37d0ea245f8a8d86126206 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 4 Feb 2020 17:42:25 -0600 Subject: [PATCH 05/24] Build --- build.properties | 4 ++-- version/1.14.4.txt | 2 +- web/changelog.txt | 18 ++++++++++++++++++ web/versions.ini | 3 ++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index d8c111f77..1f0662fb4 100644 --- a/build.properties +++ b/build.properties @@ -1,7 +1,7 @@ # -#Sun Jan 19 17:57:06 CST 2020 +#Tue Feb 04 17:42:07 CST 2020 version=r1.11 dir_output=../Build Output/Botania/ dir_repo=./ -build_number=377 +build_number=378 mod_name=Botania diff --git a/version/1.14.4.txt b/version/1.14.4.txt index 5f37c3773..14ce463e6 100644 --- a/version/1.14.4.txt +++ b/version/1.14.4.txt @@ -1 +1 @@ -r1.11-376 \ No newline at end of file +r1.11-377 \ No newline at end of file diff --git a/web/changelog.txt b/web/changelog.txt index 583cb6081..9fb09c078 100644 --- a/web/changelog.txt +++ b/web/changelog.txt @@ -1,3 +1,21 @@ +r1.11 377 +* Fix cell blocks not respecting red string spoofers +* Potential fix for lighting issues. Please reset/relight any affected areas and continue monitoring. +* Fix desu gun advancement requirements not being consistent with the name requirements +* Fix desu gun model not using the handheld transforms +* Fix mossifying an apothecary losing the fluid inside +* Delay burst entity creation until we're sure there's enough mana, should improve performance +* Entropic and Damaging bursts fired by a player now deal player damage +* Add Heart of the Sea recipe for GoG (ToMe25) +* Allow T.A. Plate to be built with shimmerrock +* Readd lexicon konami code Easter egg +* Add mana infusion recipe for sweet berries (ToMe25) +* Fix terra blade burst logic error +* Fix wand of the forest recipe spam +* Fix dispensers not planting cocoa beans properly +* Fix more cases where warped bursts transfer mana +* Fix the flugel tiara flight meter draining in spectator and creative +* Fix redirective lens pointing spreaders to 0, 0 r1.11 376 * Big round of bugfixes and enhancements. 1.15 progress can be tracked on github, and we are close! * Snowflake pendant now has a snow effect (ToMe25) diff --git a/web/versions.ini b/web/versions.ini index cbfa0a784..59b800487 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -319,4 +319,5 @@ r1.11-372=1.14.4 r1.11-373=1.14.4 r1.11-374=1.14.4 r1.11-375=1.14.4 -r1.11-376=1.14.4 \ No newline at end of file +r1.11-376=1.14.4 +r1.11-377=1.14.4 \ No newline at end of file From e2f0220dd45cce06452d7fd99f161eaa1d52da26 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 5 Feb 2020 09:50:01 +0000 Subject: [PATCH 06/24] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 4b85333df..a88bca58b 100644 --- a/contributors.properties +++ b/contributors.properties @@ -282,3 +282,4 @@ keldera=narslimmus kelnaas=10 cerhinehart=10 unblakable=6 +notnite=9 From e96550208b8fa77b81695d9381e9adebcd6613a0 Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 6 Feb 2020 01:25:47 +0100 Subject: [PATCH 07/24] Fix spawner spawned slimes working for narslimmus --- .../common/block/subtile/generating/SubTileNarslimmus.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index a3e3c6b15..8b5174293 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.generating; +import net.minecraft.entity.SpawnReason; import net.minecraft.entity.monster.SlimeEntity; import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntityType; @@ -94,6 +95,7 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower { @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { if(event.getEntityLiving() instanceof SlimeEntity + && event.getSpawnReason() == SpawnReason.NATURAL && event.getResult() != Event.Result.DENY && isSlimeChunk(event.getEntityLiving().world, event.getX(), event.getZ())) event.getEntityLiving().getPersistentData().putBoolean(TAG_WORLD_SPAWNED, true); From bbb472c3a8f7fbd8370c9ddff17a3240e98d0c21 Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 6 Feb 2020 18:51:32 +0100 Subject: [PATCH 08/24] Fix exoflames trying to smelt unsmeltables after a smeltable was put in --- .../botania/common/core/handler/ExoflameFurnaceHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java index 12efd9ccb..8f58a4a8a 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ExoflameFurnaceHandler.java @@ -91,7 +91,8 @@ public class ExoflameFurnaceHandler { this.recipeType = ExoflameFurnaceHandler.getRecipeType(furnace); } if (currentRecipe != null) { // This is already more caching than Mojang does - if(ExoflameFurnaceHandler.canSmelt(furnace, currentRecipe)) { + if(currentRecipe.matches(furnace, furnace.getWorld()) + && ExoflameFurnaceHandler.canSmelt(furnace, currentRecipe)) { return true; } } From 7a05395ba3b4ce32f7c3d44a9c9e80870745a9ce Mon Sep 17 00:00:00 2001 From: Hubry Date: Thu, 6 Feb 2020 19:00:53 +0100 Subject: [PATCH 09/24] Add a decay indicator on stacks of hydroangeas --- .../item/block/ItemBlockSpecialFlower.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 75a31e1b5..e2a73f4e4 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; import net.minecraft.tags.Tag; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; @@ -22,6 +23,8 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.common.Mod; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.Botania; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; @@ -59,4 +62,19 @@ public class ItemBlockSpecialFlower extends ItemBlockMod { tooltip.add(lore.applyTextStyles(TextFormatting.ITALIC, TextFormatting.GRAY)); } } + + @Override + public boolean showDurabilityBar(ItemStack stack) { + CompoundNBT tag = stack.getChildTag("BlockEntityTag"); + return tag != null && tag.contains(TileEntityGeneratingFlower.TAG_PASSIVE_DECAY_TICKS); + } + + @Override + public double getDurabilityForDisplay(ItemStack stack) { + CompoundNBT tag = stack.getChildTag("BlockEntityTag"); + if (tag != null) { + return tag.getInt(TileEntityGeneratingFlower.TAG_PASSIVE_DECAY_TICKS) / (double) BotaniaAPI.internalHandler.getPassiveFlowerDecay(); + } + return 0; + } } From ef4ede8906f5ef4b7aad6a84c61490e0dfadcb76 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 6 Feb 2020 21:30:27 +0000 Subject: [PATCH 10/24] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index a88bca58b..c560b5ac8 100644 --- a/contributors.properties +++ b/contributors.properties @@ -283,3 +283,5 @@ kelnaas=10 cerhinehart=10 unblakable=6 notnite=9 +amethyz=3 +lirgeth=15 From fbddf4862b8d86f0e878ea5ad4071068d0ece2b1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 7 Feb 2020 10:12:39 +0000 Subject: [PATCH 11/24] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index c560b5ac8..3ed2fe046 100644 --- a/contributors.properties +++ b/contributors.properties @@ -285,3 +285,4 @@ unblakable=6 notnite=9 amethyz=3 lirgeth=15 +nathan7722=fallenKanade From d46c35df14a7ed69ad369706e843b5f6d437a178 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 7 Feb 2020 10:56:07 -0600 Subject: [PATCH 12/24] Clean up agricarnation code a bit, fix it not speeding up berries and bamboo --- .../functional/SubTileAgricarnation.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java index 040cdebb8..4046a4bd8 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileAgricarnation.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.functional; +import com.google.common.collect.ImmutableSet; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -17,6 +18,8 @@ import net.minecraft.block.BushBlock; import net.minecraft.block.CropsBlock; import net.minecraft.block.IGrowable; import net.minecraft.block.SaplingBlock; +import net.minecraft.block.SeaPickleBlock; +import net.minecraft.block.SweetBerryBushBlock; import net.minecraft.block.material.Material; import net.minecraft.tags.BlockTags; import net.minecraft.tileentity.TileEntityType; @@ -29,14 +32,18 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.lib.LibMisc; +import java.util.Set; + public class SubTileAgricarnation extends TileEntityFunctionalFlower { @ObjectHolder(LibMisc.MOD_ID + ":agricarnation") public static TileEntityType TYPE; + private static final Set MATERIALS = ImmutableSet.of(Material.PLANTS, Material.CACTUS, Material.ORGANIC, + Material.LEAVES, Material.GOURD, Material.OCEAN_PLANT, Material.BAMBOO); private static final int RANGE = 5; private static final int RANGE_MINI = 2; - public SubTileAgricarnation(TileEntityType type) { + protected SubTileAgricarnation(TileEntityType type) { super(type); } @@ -84,16 +91,27 @@ public class SubTileAgricarnation extends TileEntityFunctionalFlower { return true; } + /** + * @return Whether the block at {@code pos} grows "naturally". That is, whether its IGrowable action is simply + * growing itself, instead of something like spreading around or creating flowers around, etc, and whether this + * action would have happened normally over time without bonemeal. + */ private boolean isPlant(BlockPos pos) { BlockState state = getWorld().getBlockState(pos); Block block = state.getBlock(); - if(block == Blocks.GRASS_BLOCK || BlockTags.LEAVES.contains(block) || block instanceof BushBlock && !(block instanceof CropsBlock) && !(block instanceof SaplingBlock)) + + // Grass spreads when ticked + if(block == Blocks.GRASS_BLOCK) return false; - Material mat = state.getMaterial(); - return (mat == Material.PLANTS || mat == Material.CACTUS || mat == Material.ORGANIC || mat == Material.LEAVES || mat == Material.GOURD) + // Exclude all BushBlock except known vanilla subclasses + if (block instanceof BushBlock && !(block instanceof CropsBlock) + && !(block instanceof SaplingBlock) && !(block instanceof SweetBerryBushBlock)) + return false; + + return MATERIALS.contains(state.getMaterial()) && block instanceof IGrowable - && ((IGrowable) block).canGrow(getWorld(), pos, getWorld().getBlockState(pos), getWorld().isRemote); + && ((IGrowable) block).canGrow(getWorld(), pos, state, getWorld().isRemote); } @Override From 647e122418d2325d01e018e0194bc4d803d24963 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 7 Feb 2020 13:53:55 -0600 Subject: [PATCH 13/24] Fix unnecessary cast in CompositeLensRecipe --- .../botania/common/crafting/recipe/CompositeLensRecipe.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index e92a62809..b87b1484f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -19,7 +19,6 @@ import net.minecraft.item.crafting.SpecialRecipeSerializer; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.mana.ICompositableLens; -import vazkii.botania.common.item.lens.ItemLens; import javax.annotation.Nonnull; @@ -74,7 +73,7 @@ public class CompositeLensRecipe extends SpecialRecipe { return ItemStack.EMPTY; ItemStack lensCopy = lens.copy(); - ((ItemLens) lens.getItem()).setCompositeLens(lensCopy, secondLens); + lensItem.setCompositeLens(lensCopy, secondLens); return lensCopy; } From bb680171416b9d8d5b225bb779971f399950fbf1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 7 Feb 2020 21:10:43 -0600 Subject: [PATCH 14/24] Fix missing nullcheck in platform. Closes #3168 --- src/main/java/vazkii/botania/common/block/BlockPlatform.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 5327be4ac..f0da160ca 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -113,7 +113,9 @@ public class BlockPlatform extends BlockMod implements IWandable, IManaCollision BlockItemUseContext ctx = new BlockItemUseContext(world, player, hand, currentStack, hit); BlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateForPlacement(ctx); - if(isValidBlock(changeState, world, pos) && !(changeState.getBlock() instanceof BlockPlatform) && changeState.getMaterial() != Material.AIR) { + if(changeState != null && isValidBlock(changeState, world, pos) + && !(changeState.getBlock() instanceof BlockPlatform) + && changeState.getMaterial() != Material.AIR) { if (!world.isRemote) { camo.camoState = changeState; world.notifyBlockUpdate(pos, state, state, 3); From 065d189c5e88182c9a15feca23cd9b613eb766c8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 10 Feb 2020 13:17:05 -0600 Subject: [PATCH 15/24] Mark cocoon-spawned entities as un-despawnable --- src/main/java/vazkii/botania/common/block/tile/TileCocoon.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index c2d8cb51c..8f381ec4c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -123,6 +123,7 @@ public class TileCocoon extends TileMod implements ITickableTileEntity{ if(entity instanceof AgeableEntity) ((AgeableEntity) entity).setGrowingAge(-24000); entity.onInitialSpawn(world, world.getDifficultyForLocation(getPos()), SpawnReason.EVENT, null, null); + entity.enablePersistence(); world.addEntity(entity); entity.spawnExplosionParticle(); } From 674c4540302bce10d1a7ade919a92efea327c839 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 11 Feb 2020 17:29:09 +0000 Subject: [PATCH 16/24] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 3ed2fe046..1739c3dc5 100644 --- a/contributors.properties +++ b/contributors.properties @@ -286,3 +286,4 @@ notnite=9 amethyz=3 lirgeth=15 nathan7722=fallenKanade +tomsalem=11 From b373df600c82583d4827363cab7cb762456b884f Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Thu, 13 Feb 2020 22:56:55 +0000 Subject: [PATCH 17/24] Update contributors.properties --- contributors.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contributors.properties b/contributors.properties index 1739c3dc5..24aa664ec 100644 --- a/contributors.properties +++ b/contributors.properties @@ -287,3 +287,6 @@ amethyz=3 lirgeth=15 nathan7722=fallenKanade tomsalem=11 +pieman807=orechid +a_helpless_baby=4 +fynn_waelsing=7 From 954020392fcc7e9b73758f87c7aff9ea6b6c8407 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 14 Feb 2020 17:00:09 +0000 Subject: [PATCH 18/24] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index 24aa664ec..672b9dc97 100644 --- a/contributors.properties +++ b/contributors.properties @@ -290,3 +290,4 @@ tomsalem=11 pieman807=orechid a_helpless_baby=4 fynn_waelsing=7 +nottorri=6 From 13668c5448ba8b5e0fff999158172f65d0f3aa9f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 15 Feb 2020 19:04:47 -0600 Subject: [PATCH 19/24] Modernize ToolCommon.raytraceFromEntity --- .../common/block/tile/TileEnderEye.java | 4 ++-- .../common/entity/EntityBabylonWeapon.java | 5 ++--- .../botania/common/item/ItemAstrolabe.java | 2 +- .../botania/common/item/ItemSextant.java | 4 ++-- .../item/equipment/bauble/ItemSwapRing.java | 5 ++--- .../item/equipment/tool/ItemStarSword.java | 4 ++-- .../item/equipment/tool/ToolCommons.java | 22 +++++++------------ .../tool/terrasteel/ItemTerraAxe.java | 4 ++-- .../tool/terrasteel/ItemTerraPick.java | 6 ++--- .../common/item/relic/ItemLokiRing.java | 6 ++--- .../botania/common/item/rod/ItemSmeltRod.java | 5 ++--- .../common/world/SkyblockWorldEvents.java | 3 +-- 12 files changed, 29 insertions(+), 41 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 5693e691f..942d5ffdb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -52,8 +52,8 @@ public class TileEnderEye extends TileMod implements ITickableTileEntity { if(!helm.isEmpty() && helm.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN)) continue; - RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 64); - if(pos.getType() == RayTraceResult.Type.BLOCK && ((BlockRayTraceResult) pos).getPos().equals(getPos())) { + BlockRayTraceResult hit = ToolCommons.raytraceFromEntity(player, 64, false); + if(hit.getType() == RayTraceResult.Type.BLOCK && hit.getPos().equals(getPos())) { looking = true; break; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 02e79427b..8e3b0161f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -126,11 +126,10 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { setMotion(Vec3d.ZERO); } else if (liveTime == delay && player != null) { Vector3 playerLook; - RayTraceResult lookat = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.SOURCE_ONLY, 64); - if(lookat.getType() != RayTraceResult.Type.BLOCK) + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 64, true); + if(rtr.getType() != RayTraceResult.Type.BLOCK) playerLook = new Vector3(player.getLookVec()).multiply(64).add(Vector3.fromEntity(player)); else { - BlockRayTraceResult rtr = (BlockRayTraceResult) lookat; playerLook = new Vector3(rtr.getPos().getX() + 0.5, rtr.getPos().getY() + 0.5, rtr.getPos().getZ() + 0.5); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index b3d241c5c..0a5e54806 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -186,7 +186,7 @@ public class ItemAstrolabe extends ItemMod { public static List getBlocksToPlace(ItemStack stack, PlayerEntity player) { List coords = new ArrayList<>(); - BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.SOURCE_ONLY, 5); + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 5, true); if(rtr.getType() == RayTraceResult.Type.BLOCK) { BlockPos pos = rtr.getPos(); BlockState state = player.world.getBlockState(pos); diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 1f6b611f8..117ae0cda 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -135,10 +135,10 @@ public class ItemSextant extends ItemMod { public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); if(!player.isSneaking()) { - RayTraceResult rtr = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 128); + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 128, false); if(rtr.getType() == RayTraceResult.Type.BLOCK) { if(!world.isRemote) { - BlockPos pos = ((BlockRayTraceResult) rtr).getPos(); + BlockPos pos = rtr.getPos(); ItemNBTHelper.setInt(stack, TAG_SOURCE_X, pos.getX()); ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, pos.getY()); ItemNBTHelper.setInt(stack, TAG_SOURCE_Z, pos.getZ()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index 2478b1f29..d931ed4d3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -41,12 +41,11 @@ public class ItemSwapRing extends ItemBauble { ISortableTool tool = (ISortableTool) currentStack.getItem(); - RayTraceResult pos = ToolCommons.raytraceFromEntity(player.world, player, - RayTraceContext.FluidMode.NONE, 4.5F); + BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(player, 4.5F, false); ToolType typeToFind = null; if(player.isSwingInProgress && pos.getType() == RayTraceResult.Type.BLOCK) { - BlockState state = entity.world.getBlockState(((BlockRayTraceResult) pos).getPos()); + BlockState state = entity.world.getBlockState(pos.getPos()); Material mat = state.getMaterial(); if(ToolCommons.materialsPick.contains(mat)) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index b081a1f17..08dc35dcb 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -43,9 +43,9 @@ public class ItemStarSword extends ItemManasteelSword { float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F; if(player.getHeldItemMainhand() == par1ItemStack && player.swingProgress == check && !world.isRemote) { - RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, RayTraceContext.FluidMode.NONE, 48); + BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(player, 48, false); if(pos.getType() == RayTraceResult.Type.BLOCK) { - Vector3 posVec = Vector3.fromBlockPos(((BlockRayTraceResult) pos).getPos()); + Vector3 posVec = Vector3.fromBlockPos(pos.getPos()); Vector3 motVec = new Vector3((0.5 * Math.random() - 0.25) * 18, 24, (0.5 * Math.random() - 0.25) * 18); posVec = posVec.add(motVec); motVec = motVec.normalize().negate().multiply(1.5); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 1ff1b9723..6ebac1ebf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -15,6 +15,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; +import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; @@ -27,6 +28,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; @@ -155,19 +157,11 @@ public final class ToolCommons { return materialLevel * 100 + modifier * 10 + efficiency; } - // [VanillaCopy] of Item.rayTrace, edits noted - public static BlockRayTraceResult raytraceFromEntity(World worldIn, PlayerEntity player, RayTraceContext.FluidMode fluidMode, double range) { - float f = player.rotationPitch; - float f1 = player.rotationYaw; - Vec3d vec3d = player.getEyePosition(1.0F); - float f2 = MathHelper.cos(-f1 * ((float)Math.PI / 180F) - (float)Math.PI); - float f3 = MathHelper.sin(-f1 * ((float)Math.PI / 180F) - (float)Math.PI); - float f4 = -MathHelper.cos(-f * ((float)Math.PI / 180F)); - float f5 = MathHelper.sin(-f * ((float)Math.PI / 180F)); - float f6 = f3 * f4; - float f7 = f2 * f4; - double d0 = range; // Botania - use custom range - Vec3d vec3d1 = vec3d.add((double)f6 * d0, (double)f5 * d0, (double)f7 * d0); - return worldIn.rayTraceBlocks(new RayTraceContext(vec3d, vec3d1, RayTraceContext.BlockMode.OUTLINE, fluidMode, player)); + // [VanillaCopy] Exact Entity.func_213324_a but available serverside, partialTicks fixed to 1, and narrowed return type + public static BlockRayTraceResult raytraceFromEntity(Entity e, double distance, boolean fluids) { + Vec3d vec3d = e.getEyePosition(1); + Vec3d vec3d1 = e.getLook(1); + Vec3d vec3d2 = vec3d.add(vec3d1.x * distance, vec3d1.y * distance, vec3d1.z * distance); + return e.world.rayTraceBlocks(new RayTraceContext(vec3d, vec3d2, RayTraceContext.BlockMode.OUTLINE, fluids ? RayTraceContext.FluidMode.ANY : RayTraceContext.FluidMode.NONE, e)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index cc07c2b7e..0ec7b16d5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -90,9 +90,9 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, PlayerEntity player) { - RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.NONE, 10); + BlockRayTraceResult raycast = ToolCommons.raytraceFromEntity(player, 10, false); if(raycast.getType() == RayTraceResult.Type.BLOCK) { - Direction face = ((BlockRayTraceResult) raycast).getFace(); + Direction face = raycast.getFace(); breakOtherBlock(player, stack, pos, pos, face); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, face); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 4b7b41223..3334ff123 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -148,9 +148,9 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, PlayerEntity player) { - RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.NONE, 10); + BlockRayTraceResult raycast = ToolCommons.raytraceFromEntity(player, 10, false); if(!player.world.isRemote && raycast.getType() == RayTraceResult.Type.BLOCK) { - Direction face = ((BlockRayTraceResult) raycast).getFace(); + Direction face = raycast.getFace(); breakOtherBlock(player, stack, pos, pos, face); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, face); // ^ Doable with API access through the IInternalMethodHandler. @@ -177,8 +177,6 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(world.isAirBlock(pos)) return; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; boolean thor = !ItemThorRing.getThorRing(player).isEmpty(); boolean doX = thor || side.getXOffset() == 0; boolean doY = thor || side.getYOffset() == 0; 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 0b9e33f06..962dc4d90 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -70,14 +70,14 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat ItemStack heldItemStack = event.getItemStack(); BlockPos originCoords = getOriginPos(lokiRing); - RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.world, player, RayTraceContext.FluidMode.ANY, 10F); + BlockRayTraceResult lookPos = ToolCommons.raytraceFromEntity(player, 10F, true); List cursors = getCursorList(lokiRing); int cost = Math.min(cursors.size(), (int) Math.pow(Math.E, cursors.size() * 0.25)); if(lookPos.getType() != RayTraceResult.Type.BLOCK) return; - BlockPos hit = ((BlockRayTraceResult) lookPos).getPos(); + BlockPos hit = lookPos.getPos(); if(heldItemStack.isEmpty()) { if(!event.getWorld().isRemote) { if(originCoords.getY() == -1) { @@ -111,7 +111,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat if(player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { ItemStack saveHeld = heldItemStack.copy(); BlockRayTraceResult newHit = new BlockRayTraceResult( - lookPos.getHitVec().subtract(pos.getX(), pos.getY(), pos.getZ()), + lookPos.getHitVec().add(pos.getX(), pos.getY(), pos.getZ()), ((BlockRayTraceResult) lookPos).getFace(), pos, false); heldItemStack.onItemUse(new ItemUseContext(player, event.getHand(), newHit)); if(player.isCreative()) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index dee670c90..677409ee4 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -80,10 +80,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { if(!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false)) return; - RayTraceResult ray = ToolCommons.raytraceFromEntity(p.world, p, RayTraceContext.FluidMode.NONE, 32); + BlockRayTraceResult pos = ToolCommons.raytraceFromEntity(p, 32, false); - if(ray.getType() == RayTraceResult.Type.BLOCK) { - BlockRayTraceResult pos = (BlockRayTraceResult) ray; + if(pos.getType() == RayTraceResult.Type.BLOCK) { BlockState state = p.world.getBlockState(pos.getPos()); dummyInv.setInventorySlotContents(0, new ItemStack(state.getBlock())); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 84d5b2888..de447729c 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -106,8 +106,7 @@ public final class SkyblockWorldEvents { event.setCancellationResult(ActionResultType.SUCCESS); } } else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL) { - BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(event.getWorld(), player, - RayTraceContext.FluidMode.SOURCE_ONLY, 4.5F); + BlockRayTraceResult rtr = ToolCommons.raytraceFromEntity(player, 4.5F, true); if(rtr.getType() == RayTraceResult.Type.BLOCK) { BlockPos pos = rtr.getPos(); if(event.getWorld().getBlockState(pos).getMaterial() == Material.WATER) { From 162519dba3f86ac9e98460300bdd8dfede19fed8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 15 Feb 2020 19:37:52 -0600 Subject: [PATCH 20/24] Fix loki ring being bork, should now match 1.7 behavior exactly. Closes #3179 --- .../common/core/helper/PlayerHelper.java | 1 + .../common/item/relic/ItemLokiRing.java | 53 +++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index 760593c6c..e92c284b1 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -130,6 +130,7 @@ public final class PlayerHelper { if(ctx.getPlayer() != null) { save = ctx.getPlayer().getHeldItem(ctx.getHand()); ctx.getPlayer().setHeldItem(ctx.getHand(), toUse); + // Need to construct a new one still to refresh the itemstack newCtx = new ItemUseContext(ctx.getPlayer(), ctx.getHand(), hit); } else { newCtx = new ItemUseContext(ctx.getWorld(), null, ctx.getHand(), toUse, hit); 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 962dc4d90..153138d2a 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -24,8 +24,9 @@ import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -37,6 +38,7 @@ import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibMisc; @@ -63,13 +65,12 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat @SubscribeEvent public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { - PlayerEntity player = event.getEntityPlayer(); + PlayerEntity player = event.getPlayer(); ItemStack lokiRing = getLokiRing(player); if(lokiRing.isEmpty() || !player.isSneaking()) return; - ItemStack heldItemStack = event.getItemStack(); - BlockPos originCoords = getOriginPos(lokiRing); + ItemStack stack = event.getItemStack(); BlockRayTraceResult lookPos = ToolCommons.raytraceFromEntity(player, 10F, true); List cursors = getCursorList(lokiRing); int cost = Math.min(cursors.size(), (int) Math.pow(Math.E, cursors.size() * 0.25)); @@ -78,25 +79,24 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat return; BlockPos hit = lookPos.getPos(); - if(heldItemStack.isEmpty()) { + if(stack.isEmpty()) { + BlockPos originCoords = getOriginPos(lokiRing); if(!event.getWorld().isRemote) { if(originCoords.getY() == -1) { + // Initiate a new pending list of positions setOriginPos(lokiRing, hit); setCursorList(lokiRing, null); } else { if(originCoords.equals(hit)) { + // Finalize the pending list of positions setOriginPos(lokiRing, new BlockPos(0, -1, 0)); } else { - addCursor : { - BlockPos relPos = hit.subtract(originCoords); - - for(BlockPos cursor : cursors) - if(cursor.equals(relPos)) { - cursors.remove(cursor); - setCursorList(lokiRing, cursors); - break addCursor; - } + // Toggle offsets on or off from the pending list of positions + BlockPos relPos = hit.subtract(originCoords); + if (cursors.remove(relPos)) { + setCursorList(lokiRing, cursors); + } else { addCursor(lokiRing, relPos); } } @@ -106,16 +106,25 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat event.setCanceled(true); event.setCancellationResult(ActionResultType.SUCCESS); } else { + ItemStack original = stack.copy(); for(BlockPos cursor : cursors) { BlockPos pos = hit.add(cursor); - if(player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { - ItemStack saveHeld = heldItemStack.copy(); - BlockRayTraceResult newHit = new BlockRayTraceResult( - lookPos.getHitVec().add(pos.getX(), pos.getY(), pos.getZ()), - ((BlockRayTraceResult) lookPos).getFace(), pos, false); - heldItemStack.onItemUse(new ItemUseContext(player, event.getHand(), newHit)); - if(player.isCreative()) - player.setHeldItem(event.getHand(), saveHeld); + if(ManaItemHandler.requestManaExact(lokiRing, player, cost, false)) { + Vec3d lookHit = lookPos.getHitVec(); + Vec3d newHitVec = new Vec3d(pos.getX() + MathHelper.frac(lookHit.getX()), pos.getY() + MathHelper.frac(lookHit.getY()), pos.getZ() + MathHelper.frac(lookHit.getZ())); + BlockRayTraceResult newHit = new BlockRayTraceResult(newHitVec, lookPos.getFace(), pos, false); + ItemUseContext ctx = new ItemUseContext(player, event.getHand(), newHit); + + ActionResultType result; + if (player.isCreative()) { + result = PlayerHelper.substituteUse(ctx, original.copy()); + } else { + result = stack.onItemUse(ctx); + } + + if (result == ActionResultType.SUCCESS) { + ManaItemHandler.requestManaExact(lokiRing, player, cost, true); + } } } } From 3ccbef5c169c470718674c979aa9e13e489efa5b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 15 Feb 2020 19:57:40 -0600 Subject: [PATCH 21/24] Loki ring now highlights center pos in bold even when not building a new list of cursors --- .../item/IWireframeCoordinateListProvider.java | 6 +++++- .../botania/common/item/relic/ItemLokiRing.java | 15 ++++++++++++++- .../botania/common/item/rod/ItemExchangeRod.java | 5 ----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java index 871b0c984..7a8194b63 100644 --- a/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java +++ b/src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; +import javax.annotation.Nullable; import java.util.List; /** @@ -34,7 +35,10 @@ public interface IWireframeCoordinateListProvider { * This is useful to indicate the precedence of some position over the others. * @return The position of a single wireframe to draw thicker than all the others. */ - public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack); + @Nullable + default BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) { + return null; + } } 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 153138d2a..65321d137 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -182,8 +182,21 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } @Override + @OnlyIn(Dist.CLIENT) public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) { - return getLokiRing(player) == stack ? getOriginPos(stack) : null; + Minecraft mc = Minecraft.getInstance(); + if (getLokiRing(player) == stack) { + BlockPos currentBuildCenter = getOriginPos(stack); + if (currentBuildCenter.getY() != -1) { + return currentBuildCenter; + } else if (mc.objectMouseOver instanceof BlockRayTraceResult + && mc.objectMouseOver.getType() == RayTraceResult.Type.BLOCK + && !getCursorList(stack).isEmpty()) { + return ((BlockRayTraceResult) mc.objectMouseOver).getPos(); + } + } + + return null; } private static ItemStack getLokiRing(PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 7ade1c670..746e4cca1 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -384,9 +384,4 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return ImmutableList.of(); } - @Override - public BlockPos getSourceWireframe(PlayerEntity player, ItemStack stack) { - return null; - } - } From eabdbd910a28b4daff59aa85f566cbb56ca525c6 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 16 Feb 2020 14:16:03 +0000 Subject: [PATCH 22/24] Update contributors.properties --- contributors.properties | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contributors.properties b/contributors.properties index 672b9dc97..481bf45bc 100644 --- a/contributors.properties +++ b/contributors.properties @@ -291,3 +291,5 @@ pieman807=orechid a_helpless_baby=4 fynn_waelsing=7 nottorri=6 +hecatesowl=2 +darkfiend009=pollidisiac From 9253a541c4765b6de779fa33de618e2fc478d513 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 16 Feb 2020 21:20:11 -0600 Subject: [PATCH 23/24] Replace bauble box slots with a player render because what else would i put there --- .../client/gui/box/ContainerBaubleBox.java | 13 ------------- .../botania/client/gui/box/GuiBaubleBox.java | 12 ++++++------ .../botania/textures/gui/bauble_box.png | Bin 16368 -> 1808 bytes 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index 07e28f18b..b01d7278f 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -47,19 +47,6 @@ public class ContainerBaubleBox extends Container { this.box = box; IItemHandlerModifiable baubleBoxInv = (IItemHandlerModifiable) box.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null); - /* todo 1.13 remove these slots from the gui texture and provide a button to open curios gui instead - baubles = BaublesApi.getBaublesHandler(player); - - addSlotToContainer(new SlotBauble(player, baubles, 0, 8, 8 + 0 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 1, 8, 8 + 1 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 2, 8, 8 + 2 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 3, 8, 8 + 3 * 18)); - - addSlotToContainer(new SlotBauble(player, baubles, 4, 27, 8 + 0 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 5, 27, 8 + 1 * 18)); - addSlotToContainer(new SlotBauble(player, baubles, 6, 27, 8 + 2 * 18)); - */ - for(i = 0; i < 4; ++i) for(j = 0; j < 6; ++j) { int k = j + i * 6; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 8fa269497..068b8a436 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -13,6 +13,7 @@ package vazkii.botania.client.gui.box; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.inventory.ContainerScreen; +import net.minecraft.client.gui.screen.inventory.InventoryScreen; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.util.ResourceLocation; @@ -22,6 +23,8 @@ import vazkii.botania.client.lib.LibResources; public class GuiBaubleBox extends ContainerScreen { private static final ResourceLocation texture = new ResourceLocation(LibResources.GUI_BAUBLE_BOX); + private int mouseX; + private int mouseY; public GuiBaubleBox(ContainerBaubleBox container, PlayerInventory player, ITextComponent title) { super(container, player, title); @@ -31,6 +34,8 @@ public class GuiBaubleBox extends ContainerScreen { public void render(int mouseX, int mouseY, float partialTicks) { this.renderBackground(); super.render(mouseX, mouseY, partialTicks); + this.mouseX = mouseX; + this.mouseY = mouseY; this.renderHoveredToolTip(mouseX, mouseY); } @@ -39,12 +44,7 @@ public class GuiBaubleBox extends ContainerScreen { GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); Minecraft.getInstance().getTextureManager().bindTexture(texture); blit(guiLeft, guiTop, 0, 0, xSize, ySize); - - for(int i1 = 0; i1 < 7; ++i1) { - Slot slot = container.inventorySlots.get(i1); - if(slot.getHasStack() && slot.getSlotStackLimit() == 1) - blit(guiLeft+slot.xPos, guiTop+slot.yPos, 200, 0, 16, 16); - } + InventoryScreen.drawEntityOnScreen(guiLeft + 31, guiTop + 75, 30, guiLeft + 31 - this.mouseX, guiTop + 75 - 50 - this.mouseY, this.minecraft.player); } } diff --git a/src/main/resources/assets/botania/textures/gui/bauble_box.png b/src/main/resources/assets/botania/textures/gui/bauble_box.png index 3e91da92da115201a94d0b6b8f3247a5bce3f877..f5927411543b5e40636451f89cdd2e215a197cea 100644 GIT binary patch literal 1808 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5D>38$lZxy-8q?;Kn_c~qpu?a z!^VE@KZ&di49pAxJ|V6^adUI?(9qEC?(Sp9j{X1tA1E>kMnhnPgh10{aTQRmDGBlm z1}6TI3>bpHv#SE5owL9rvY3H^?+6GpPSxglFzsfc@f<6_oh0}D?`Tb{5WeN=Fyu-rrt&>-qM#w{z!mv22_A@89j;HI4fj-mfm% z=_9^_`N?f@4u%G!hVB2~{kpt--OYd_{@7|{ofxecTG-eFa?_8Ft0i) zo?&OTtmwV>Y3}WQs~A6Rs|@+!WR2B|1@FwtuX!3eyo+^fEw{dTaUsx)e=f<1{+n@r zF3g5ccP_(R$FO4e$(f}=JQJ#?2R^*(S61?3iIl?rE$*%M&x)}I$E&=ew7DY8YXpIY z0nPcvbmH#o6(8!%t*uIecqeQ>yZDg!t)0S9n?O#7S;|nledlJsF2-xXD7eQkovWdC zcl~=KQHD3s`>I=){r_9u&|lx2`m5%}OwpRBQH&?H@j7hFW!RL~6@vd$@?2>=43BSioJ literal 16368 zcmeI3dt4J&7RPS_0)h{s^;N2*(MnkxCJBVc5JH3?&^Abc-GZVLk|AWtt9eM!3PEcH zYY|&^FA|!E|&%|-sOr| zB26fkDvwy8#bOsk#Yq;VNdlydV7@cYh~fd1m|jdbDitanY7Ao7;-a{19Yz>*n?#=$ z#F%bPNRJmq(?iu-jL!A)WlC7SessS8FE-cD&&Tf#I)}yPA}nvjo5kdKqdqLuhePkV z7<^~k;%TKRXpC@1PdfasAV#WQuR#$cJw4qk-P=p8l_BhafB=NWK{y;Hu3+jiRC=+I zsnSjE4)P?95YtJta*bZDR?)3-#mQ=eK8V4vChEO?^M z>BHvZ2zrnX=&6g#&|pXmrc)cV5-e;!{wR|NdV0M)rLQZ%)9q$! zh3*RR@MlFswU}71*2byT3VwH&ML$7E4-K_-75(*h`6R!Oi(As-*`lFOy2FP9S_^_OByws(qzDNXV5XZo{P943q9 zQ*01LBG~4SL%rmJX#bWP0J^ExqA-A1L8nIS~S$A9z^3(Wi^G*mN1*6Mto|cSn8Nt$%nP zVmYJ^FNgo^4KERiSUkKa! zyT=ut?(drLd{=n7ziXf8KUH!)pVO1A-!SB5J$bv2g;@M00pt5}x!znJ(to(WN3`6C zDdL54eE;gKUCH74_Bi#Q8PGFfP)}&4$FsXw&_8rrExSkY*9H7d1?hcNdAiKKTj6gu z`X1?T4h)AQlfX0xZ4wtDB3MA;f@u)iBrZZkuze>2ob>o z5*JK^&?a#aB7y}ZE|>ra@?vxCjx!0umQYgU}{%5h8*GBrcc+ zp-ti+Trdqno5V$k2o{jIU>bxriHi^sEFf{gGze`H7a<~8K;nXF5ZWXzLPW5D z#0AqJv`Jiqh+qMU3#LJ6KNpvC-^YKL3jg9S9sjgXy0N+d|16L$iHH#au;4WSOiKWG z)P>(005GrsxSa$5x)y+O>QCk!o&kWPFj6=@&Um5m;`E%=_3j7nUEY@V+W3e`x1(L{ zi!3odE)!AvtD>{9MWq;0lQ$$+??g?|H_#Vfd9`uWKK-Yt;q~#~-ny}2O7$+*g|TDV z%Gh*NQTp9)#~K?Ccvt@%*nCrWyRs!K@kZ;Trj`Si&Rxcm3DG0Ym;YH(Q&SW2$Huvp zGEeiW(L0V`R$S;>Eqy3U(5(;Gn3kzSlH7jiR?X-l%#4k@cotnWm++>~o#L*f zv44>HSk^jSp8!~Sl%rWrN5ivU-7woER(0k$c9oPbI`c>P4AvIPQFWurefXq9j(Mh6 z9g?a8^OQ-rjvL zSIrL`XSzfiJu;kkPw`7$QSK2(WN%D<2=MLLGl#mn_Nwq{PHuk%QBiSu4sQ`$#FA>U7Yi=dnLE7 zeq8llE%(|rzvDRt^CnMS!}znN-g&w+B~{s&83o+JO5RKE>hLzbC7aB+_N!mp;bm$h zTzKfz%C@jW9v0;NCg#t8zFP(^`94f>$k-lEXH;wt9`=57W30t|?^YIKOferH>FJQ< zI(p&Rnc(Kv<}0Ub$|ttPf(Qn9RJtg*>yn|x-RPJ6vxK%X`0^hk=Y0LrZo7G5b=7qh zFDV`lEvfZ3iH1Lj|AxlS@K3HUYhCYjv1URwaw)IAzP`Qv{-?BkZNkP26RRFJNB&?y%225Ui|kp8T)O+`Z|3$v1_Co!2UJjxr|A%H8`&cIZTI&cbaKuAAD1 zCB5Z#KvdV+Q2tF@N>=6L&K2A2w+<cl>|)aF^<~hl>Z$P;VW3kZ9SoGwR>5o2MCEl4k8N>{&Q*WZ5MupaLgg zJ8hmZOu*`e~3%6#4qz{Ep%2e@(nTZ9>KKK@v+&a5kPOEiE_4FFQa;I1lGph^82i^Tj->yebz%}(DhO7j>Wg&80kND8a|n~ z>?(WA+SBYY=a@Du(KU6!OV~78!W!)OjMA&emo6^`yJqdUajC@T$Gc$Xu>0zyGqXb? zyPBqYwyvj2w`OG@yldNX&&l_~Q-iMjg(LM==&yu~IA*p3NYWA71 Date: Sun, 16 Feb 2020 21:21:36 -0600 Subject: [PATCH 24/24] Narrator: it wasn't released --- .../vazkii/botania/common/core/handler/EquipmentHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java index 1c7474d78..202d6f052 100644 --- a/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/EquipmentHandler.java @@ -37,7 +37,7 @@ import java.util.function.Predicate; public abstract class EquipmentHandler { public static EquipmentHandler instance; - public static void init() { //todo maybe support baubles when/if that gets released + public static void init() { if(Botania.curiosLoaded) { instance = new CurioIntegration(); FMLJavaModLoadingContext.get().getModEventBus().register(CurioIntegration.class);