mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Fix Hanging Pale Moss not dropping with modded shears (#10414)
This commit is contained in:
1 parent
6ae39c8597
commit
c97eabc0c4
4 files changed
+204
-3
No files matched your search
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{
|
||||
"action": "shears_dig",
|
||||
"condition": "forge:can_tool_perform_action"
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:match_tool",
|
||||
"predicate": {
|
||||
"predicates": {
|
||||
"minecraft:enchantments": [
|
||||
{
|
||||
"enchantments": "minecraft:silk_touch",
|
||||
"levels": {
|
||||
"min": 1
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "minecraft:pale_hanging_moss"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
}
|
||||
],
|
||||
"random_sequence": "minecraft:blocks/pale_hanging_moss"
|
||||
}
|
||||
@@ -130,11 +130,11 @@ public final class ForgeLootTableProvider extends LootTableProvider {
|
||||
} else if (invLootCondition instanceof CompositeLootItemCondition compositeLootItemCondition && findAndReplaceInComposite(compositeLootItemCondition, from, toolAction)) {
|
||||
found = true;
|
||||
}
|
||||
} else if (lootCondition instanceof CompositeLootItemCondition compositeLootItemCondition && findAndReplaceInComposite(compositeLootItemCondition, from, toolAction)) {
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
return found;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,11 @@ import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.Util;
|
||||
import net.minecraft.network.chat.MutableComponent;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
@@ -119,6 +124,10 @@ public interface IForgeGameTestHelper {
|
||||
}
|
||||
|
||||
default ServerPlayer makeMockServerPlayer() {
|
||||
return makeMockServerPlayer(true);
|
||||
}
|
||||
|
||||
default ServerPlayer makeMockServerPlayer(boolean creative) {
|
||||
var level = self().getLevel();
|
||||
var cookie = CommonListenerCookie.createInitial(new GameProfile(UUID.randomUUID(), "test-mock-player"), false);
|
||||
var player = new ServerPlayer(level.getServer(), level, cookie.gameProfile(), cookie.clientInformation()) {
|
||||
@@ -127,7 +136,7 @@ public interface IForgeGameTestHelper {
|
||||
}
|
||||
|
||||
public boolean isCreative() {
|
||||
return true;
|
||||
return creative;
|
||||
}
|
||||
};
|
||||
var connection = new Connection(PacketFlow.SERVERBOUND);
|
||||
@@ -186,6 +195,32 @@ public interface IForgeGameTestHelper {
|
||||
}
|
||||
}
|
||||
|
||||
default void setAndAssertBlock(int x, int y, int z, Block block) {
|
||||
this.setAndAssertBlock(x, y, z, block.defaultBlockState());
|
||||
}
|
||||
|
||||
default void setAndAssertBlock(int x, int y, int z, BlockState state) {
|
||||
this.setAndAssertBlock(new BlockPos(x, y, z), state);
|
||||
}
|
||||
|
||||
default void setAndAssertBlock(BlockPos pos, Block block) {
|
||||
this.setAndAssertBlock(pos, block.defaultBlockState());
|
||||
}
|
||||
|
||||
default void setAndAssertBlock(BlockPos pos, BlockState state) {
|
||||
this.assertTrue(
|
||||
this.self().getLevel().setBlock(this.self().absolutePos(pos), state, Block.UPDATE_ALL),
|
||||
() -> "Failed to set block at pos %s : %s".formatted(pos, state.getBlock())
|
||||
);
|
||||
}
|
||||
|
||||
default void removeAllItemEntitiesInRange(BlockPos pos, double range) {
|
||||
BlockPos blockpos = this.self().absolutePos(pos);
|
||||
for (ItemEntity itemEntity : this.self().getLevel().getEntities(EntityType.ITEM, new AABB(blockpos).inflate(range), Entity::isAlive)) {
|
||||
itemEntity.remove(Entity.RemovalReason.DISCARDED);
|
||||
}
|
||||
}
|
||||
|
||||
default <T> Flag<T> flag(String name) {
|
||||
return new Flag<>(name);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug.gameplay.loot;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.gametest.framework.GameTest;
|
||||
import net.minecraft.gametest.framework.GameTestHelper;
|
||||
import net.minecraft.world.entity.EquipmentSlot;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.item.ShearsItem;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.DoublePlantBlock;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.gametest.GameTestHolder;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.test.BaseTestMod;
|
||||
|
||||
@Mod(ShearsLootTests.MODID)
|
||||
@GameTestHolder("forge." + ShearsLootTests.MODID)
|
||||
public class ShearsLootTests extends BaseTestMod {
|
||||
public static final String MODID = "shears_loot";
|
||||
|
||||
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
|
||||
private static final RegistryObject<Item> MODDED_SHEARS = ITEMS.register("modded_shears", () -> new ShearsItem(new Item.Properties()
|
||||
.component(DataComponents.TOOL, ShearsItem.createToolProperties())
|
||||
.setId(ITEMS.key("modded_shears"))
|
||||
));
|
||||
|
||||
public ShearsLootTests(FMLJavaModLoadingContext context) {
|
||||
super(context);
|
||||
this.testItem(lookup -> MODDED_SHEARS.get().getDefaultInstance());
|
||||
}
|
||||
|
||||
@GameTest(template = "forge:empty3x3x3")
|
||||
public static void test_shears_drop_blocks(GameTestHelper helper) {
|
||||
Test[] tests = {
|
||||
//leaves
|
||||
Test.of(Blocks.ACACIA_LEAVES),
|
||||
Test.of(Blocks.AZALEA_LEAVES),
|
||||
Test.of(Blocks.BIRCH_LEAVES),
|
||||
Test.of(Blocks.CHERRY_LEAVES),
|
||||
Test.of(Blocks.DARK_OAK_LEAVES),
|
||||
Test.of(Blocks.FLOWERING_AZALEA_LEAVES),
|
||||
Test.of(Blocks.JUNGLE_LEAVES),
|
||||
Test.of(Blocks.MANGROVE_LEAVES),
|
||||
Test.of(Blocks.OAK_LEAVES),
|
||||
Test.of(Blocks.PALE_OAK_LEAVES),
|
||||
Test.of(Blocks.SPRUCE_LEAVES),
|
||||
|
||||
//misc
|
||||
Test.of(Blocks.COBWEB),
|
||||
Test.of(Blocks.DEAD_BUSH),
|
||||
Test.of(Blocks.FERN),
|
||||
Test.of(Blocks.HANGING_ROOTS),
|
||||
Test.of(Blocks.NETHER_SPROUTS),
|
||||
Test.of(Blocks.PALE_HANGING_MOSS),
|
||||
Test.of(Blocks.SEAGRASS),
|
||||
Test.of(Blocks.SHORT_GRASS),
|
||||
Test.of(Blocks.TWISTING_VINES),
|
||||
Test.of(Blocks.VINE),
|
||||
Test.of(Blocks.WEEPING_VINES),
|
||||
|
||||
// Tall things that need surrounding blocks
|
||||
Test.tall(Blocks.LARGE_FERN, Items.FERN),
|
||||
Test.tall(Blocks.TALL_GRASS, Items.SHORT_GRASS),
|
||||
Test.tall(Blocks.TALL_SEAGRASS, Items.SEAGRASS),
|
||||
|
||||
// Things that need a state different then default
|
||||
Test.of(Blocks.GLOW_LICHEN.defaultBlockState().setValue(BlockStateProperties.NORTH, true), Items.GLOW_LICHEN),
|
||||
};
|
||||
|
||||
helper.makeFloor(); // Seagrass makes water
|
||||
var player = helper.makeMockServerPlayer(false); // Plants prevent loot for creative players
|
||||
var center = new BlockPos(1, 1, 1);
|
||||
|
||||
player.setItemSlot(EquipmentSlot.MAINHAND, new ItemStack(MODDED_SHEARS.get()));
|
||||
|
||||
for (Test test : tests) {
|
||||
helper.setAndAssertBlock(center, test.state());
|
||||
if (test.below() != null)
|
||||
helper.setAndAssertBlock(center.below(), test.below());
|
||||
|
||||
player.gameMode.destroyBlock(helper.absolutePos(center));
|
||||
|
||||
helper.assertItemEntityPresent(test.item(), center, 1.0);
|
||||
|
||||
// Cleanup after ourselves
|
||||
helper.setBlock(center, Blocks.AIR);
|
||||
helper.setBlock(center.below(), Blocks.AIR);
|
||||
|
||||
helper.removeAllItemEntitiesInRange(center, 1.0);
|
||||
}
|
||||
|
||||
helper.succeed();
|
||||
}
|
||||
|
||||
|
||||
private record Test(BlockState state, @Nullable BlockState below, Item item) {
|
||||
private static Test of(Block block) {
|
||||
return new Test(block.defaultBlockState(), null, block.asItem());
|
||||
}
|
||||
private static Test of(BlockState state, Item item) {
|
||||
return new Test(state, null, item);
|
||||
}
|
||||
private static Test tall(Block block, Item item) {
|
||||
return new Test(block.defaultBlockState().setValue(DoublePlantBlock.HALF, DoubleBlockHalf.UPPER), block.defaultBlockState().setValue(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER), item);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user