From e76edee845cfb1be5a87512b080f50a9935b1d7e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 20 Jul 2020 09:43:48 -0500 Subject: [PATCH] Readd special flowers to small_flowers tag, prevent endermen pickup with a mixin --- .../data/minecraft/tags/blocks/flowers.json | 6 ---- .../minecraft/tags/blocks/small_flowers.json | 3 +- .../data/minecraft/tags/items/flowers.json | 6 ---- .../minecraft/tags/items/small_flowers.json | 3 +- .../vazkii/botania/data/BlockTagProvider.java | 3 +- .../vazkii/botania/data/ItemTagProvider.java | 3 +- .../mixin/MixinEndermanPickupBlock.java | 35 +++++++++++++++++++ .../assets/botania/botania.mixins.json | 1 + 8 files changed, 42 insertions(+), 18 deletions(-) delete mode 100644 src/generated/resources/data/minecraft/tags/blocks/flowers.json delete mode 100644 src/generated/resources/data/minecraft/tags/items/flowers.json create mode 100644 src/main/java/vazkii/botania/mixin/MixinEndermanPickupBlock.java diff --git a/src/generated/resources/data/minecraft/tags/blocks/flowers.json b/src/generated/resources/data/minecraft/tags/blocks/flowers.json deleted file mode 100644 index 235af2367..000000000 --- a/src/generated/resources/data/minecraft/tags/blocks/flowers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#botania:special_flowers" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json index 6d0a48d25..03c58ccbd 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json +++ b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "#botania:mystical_flowers" + "#botania:mystical_flowers", + "#botania:special_flowers" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/flowers.json b/src/generated/resources/data/minecraft/tags/items/flowers.json deleted file mode 100644 index 235af2367..000000000 --- a/src/generated/resources/data/minecraft/tags/items/flowers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#botania:special_flowers" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/small_flowers.json b/src/generated/resources/data/minecraft/tags/items/small_flowers.json index 6d0a48d25..03c58ccbd 100644 --- a/src/generated/resources/data/minecraft/tags/items/small_flowers.json +++ b/src/generated/resources/data/minecraft/tags/items/small_flowers.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "#botania:mystical_flowers" + "#botania:mystical_flowers", + "#botania:special_flowers" ] } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/data/BlockTagProvider.java b/src/main/java/vazkii/botania/data/BlockTagProvider.java index 0eb2a5c40..8d624b8f2 100644 --- a/src/main/java/vazkii/botania/data/BlockTagProvider.java +++ b/src/main/java/vazkii/botania/data/BlockTagProvider.java @@ -116,8 +116,7 @@ public class BlockTagProvider extends BlockTagsProvider { .func_240531_a_(ModTags.Blocks.FUNCTIONAL_SPECIAL_FLOWERS); func_240522_a_(BlockTags.TALL_FLOWERS).func_240531_a_(ModTags.Blocks.DOUBLE_MYSTICAL_FLOWERS); - func_240522_a_(BlockTags.SMALL_FLOWERS).func_240531_a_(ModTags.Blocks.MYSTICAL_FLOWERS); - func_240522_a_(BlockTags.FLOWERS).func_240531_a_(ModTags.Blocks.SPECIAL_FLOWERS); + func_240522_a_(BlockTags.SMALL_FLOWERS).func_240531_a_(ModTags.Blocks.MYSTICAL_FLOWERS).func_240531_a_(ModTags.Blocks.SPECIAL_FLOWERS); func_240522_a_(BlockTags.IMPERMEABLE).func_240534_a_(ModBlocks.elfGlass, ModBlocks.manaGlass, ModBlocks.bifrost, ModBlocks.bifrostPerm); func_240522_a_(BlockTags.BEACON_BASE_BLOCKS).func_240534_a_(ModBlocks.manasteelBlock, ModBlocks.terrasteelBlock, ModBlocks.elementiumBlock, diff --git a/src/main/java/vazkii/botania/data/ItemTagProvider.java b/src/main/java/vazkii/botania/data/ItemTagProvider.java index 2fca8806f..db453e3a3 100644 --- a/src/main/java/vazkii/botania/data/ItemTagProvider.java +++ b/src/main/java/vazkii/botania/data/ItemTagProvider.java @@ -52,8 +52,7 @@ public class ItemTagProvider extends ItemTagsProvider { this.func_240521_a_(ModTags.Blocks.SPECIAL_FLOWERS, ModTags.Items.SPECIAL_FLOWERS); this.func_240522_a_(ItemTags.TALL_FLOWERS).func_240531_a_(ModTags.Items.DOUBLE_MYSTICAL_FLOWERS); - this.func_240522_a_(ItemTags.SMALL_FLOWERS).func_240531_a_(ModTags.Items.MYSTICAL_FLOWERS); - this.func_240522_a_(ItemTags.FLOWERS).func_240531_a_(ModTags.Items.SPECIAL_FLOWERS); + this.func_240522_a_(ItemTags.SMALL_FLOWERS).func_240531_a_(ModTags.Items.MYSTICAL_FLOWERS).func_240531_a_(ModTags.Items.SPECIAL_FLOWERS); this.func_240522_a_(ModTags.Items.BURST_VIEWERS).func_240532_a_(ModItems.monocle); } diff --git a/src/main/java/vazkii/botania/mixin/MixinEndermanPickupBlock.java b/src/main/java/vazkii/botania/mixin/MixinEndermanPickupBlock.java new file mode 100644 index 000000000..eb34bb672 --- /dev/null +++ b/src/main/java/vazkii/botania/mixin/MixinEndermanPickupBlock.java @@ -0,0 +1,35 @@ +package vazkii.botania.mixin; + +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import vazkii.botania.common.lib.ModTags; + +import java.util.Random; + +/** + * This Mixin prevents Endermen from picking up special flowers, even though they are in the small_flowers tag + * and thus the endermen_holdable tag. + * + * We want them in the small_flowers tag so things such as suspicious stew crafting and bee pollination will work, + * but Endermen griefing Botania machinery setups is not good. + */ +@Mixin(targets = { "net.minecraft.entity.monster.EndermanEntity$TakeBlockGoal" }) +public class MixinEndermanPickupBlock { + @Inject( + at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/World;getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"), + method = "tick()V", + locals = LocalCapture.CAPTURE_FAILSOFT, + cancellable = true + ) + private void dontTakeMagicFlowers(CallbackInfo ci, Random rand, World world, int i, int j, int k, BlockPos takePos, BlockState takeState) { + if (takeState.isIn(ModTags.Blocks.SPECIAL_FLOWERS)) { + ci.cancel(); + } + } +} diff --git a/src/main/resources/assets/botania/botania.mixins.json b/src/main/resources/assets/botania/botania.mixins.json index c5346b3f0..f3cb6607d 100644 --- a/src/main/resources/assets/botania/botania.mixins.json +++ b/src/main/resources/assets/botania/botania.mixins.json @@ -19,6 +19,7 @@ "AccessorNearestAttackableTarget", "AccessorRecipeManager", "AccessorWitherEntity", + "MixinEndermanPickupBlock", "MixinPlayerEntity" ], "client": [