Skip to content

Commit 6eb1879

Browse files
claudeclaude
committed
Add undead wood variants to log tags
The minecraft:logs, minecraft:logs_that_burn and c:logs_that_burn tags only listed undead_log and undead_log_stripped, so undead_wood and undead_wood_stripped were missing. Reference #evilcraft:undead_logs instead, like vanilla does with its per-wood tags. Closes #1290 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DhnEiNFxiktTnNVVjBJkAi
1 parent 882c967 commit 6eb1879

8 files changed

Lines changed: 73 additions & 16 deletions

File tree

‎src/main/java/org/cyclops/evilcraft/EvilCraft.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ public Class<?>[] getGameTestClasses() {
482482
GameTestsSanguinaryEnvironmentalAccumulator.class,
483483
GameTestsSpiritFurnace.class,
484484
GameTestsSpiritReanimator.class,
485+
GameTestsUndeadLogTags.class,
485486
GameTestsVengeanceSpirits.class,
486487
GameTestsWerewolfVillager.class,
487488
};

‎src/main/java/org/cyclops/evilcraft/gametest/GameTestsUndeadLogTags.java‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
package org.cyclops.evilcraft.gametest;
2+
3+
import net.minecraft.core.BlockPos;
4+
import net.minecraft.core.registries.Registries;
5+
import net.minecraft.gametest.framework.GameTestHelper;
6+
import net.minecraft.network.chat.Component;
7+
import net.minecraft.resources.Identifier;
8+
import net.minecraft.tags.BlockTags;
9+
import net.minecraft.tags.ItemTags;
10+
import net.minecraft.tags.TagKey;
11+
import net.minecraft.world.item.Item;
12+
import net.minecraft.world.item.ItemStack;
13+
import net.minecraft.world.level.block.Block;
14+
import net.minecraft.world.level.block.state.BlockState;
15+
import org.cyclops.cyclopscore.gametest.GameTest;
16+
import org.cyclops.evilcraft.Reference;
17+
import org.cyclops.evilcraft.RegistryEntries;
18+
19+
import java.util.List;
20+
21+
public class GameTestsUndeadLogTags {
22+
23+
public static final String TEMPLATE_EMPTY = Reference.MOD_ID + ":empty10";
24+
public static final BlockPos POS = BlockPos.ZERO.offset(2, 0, 2);
25+
26+
private static final TagKey<Block> BLOCK_C_LOGS_THAT_BURN = TagKey.create(Registries.BLOCK, Identifier.parse("c:logs_that_burn"));
27+
private static final TagKey<Item> ITEM_C_LOGS_THAT_BURN = TagKey.create(Registries.ITEM, Identifier.parse("c:logs_that_burn"));
28+
29+
private static List<Block> getUndeadLogs() {
30+
return List.of(
31+
RegistryEntries.BLOCK_UNDEAD_LOG.get(),
32+
RegistryEntries.BLOCK_UNDEAD_LOG_STRIPPED.get(),
33+
RegistryEntries.BLOCK_UNDEAD_WOOD.get(),
34+
RegistryEntries.BLOCK_UNDEAD_WOOD_STRIPPED.get()
35+
);
36+
}
37+
38+
@GameTest(template = TEMPLATE_EMPTY)
39+
public void testUndeadLogsBlockTags(GameTestHelper helper) {
40+
for (Block block : getUndeadLogs()) {
41+
helper.setBlock(POS, block);
42+
BlockState state = helper.getBlockState(POS);
43+
helper.assertTrue(state.is(BlockTags.LOGS), Component.literal(block + " is not in minecraft:logs"));
44+
helper.assertTrue(state.is(BlockTags.LOGS_THAT_BURN), Component.literal(block + " is not in minecraft:logs_that_burn"));
45+
helper.assertTrue(state.is(BLOCK_C_LOGS_THAT_BURN), Component.literal(block + " is not in c:logs_that_burn"));
46+
}
47+
helper.succeed();
48+
}
49+
50+
@GameTest(template = TEMPLATE_EMPTY)
51+
public void testUndeadLogsItemTagsAndFuel(GameTestHelper helper) {
52+
for (Block block : getUndeadLogs()) {
53+
ItemStack itemStack = new ItemStack(block);
54+
helper.assertTrue(itemStack.is(ItemTags.LOGS), Component.literal(block + " item is not in minecraft:logs"));
55+
helper.assertTrue(itemStack.is(ItemTags.LOGS_THAT_BURN), Component.literal(block + " item is not in minecraft:logs_that_burn"));
56+
helper.assertTrue(itemStack.is(ITEM_C_LOGS_THAT_BURN), Component.literal(block + " item is not in c:logs_that_burn"));
57+
helper.assertTrue(helper.getLevel().fuelValues().burnDuration(itemStack) > 0, Component.literal(block + " item is not a furnace fuel"));
58+
}
59+
helper.succeed();
60+
}
61+
62+
}

‎src/main/resources/data/c/tags/block/logs_that_burn.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
"evilcraft:undead_log",
5-
"evilcraft:undead_log_stripped"
4+
"#evilcraft:undead_logs"
65
]
7-
}
6+
}

‎src/main/resources/data/c/tags/item/logs_that_burn.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
"evilcraft:undead_log",
5-
"evilcraft:undead_log_stripped"
4+
"#evilcraft:undead_logs"
65
]
7-
}
6+
}

‎src/main/resources/data/minecraft/tags/block/logs.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
"evilcraft:undead_log",
5-
"evilcraft:undead_log_stripped"
4+
"#evilcraft:undead_logs"
65
]
76
}

‎src/main/resources/data/minecraft/tags/block/logs_that_burn.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
"evilcraft:undead_log",
5-
"evilcraft:undead_log_stripped"
4+
"#evilcraft:undead_logs"
65
]
7-
}
6+
}

‎src/main/resources/data/minecraft/tags/item/logs.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
"evilcraft:undead_log",
5-
"evilcraft:undead_log_stripped"
4+
"#evilcraft:undead_logs"
65
]
76
}

‎src/main/resources/data/minecraft/tags/item/logs_that_burn.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"replace": false,
33
"values": [
4-
"evilcraft:undead_log",
5-
"evilcraft:undead_log_stripped"
4+
"#evilcraft:undead_logs"
65
]
7-
}
6+
}

0 commit comments

Comments
 (0)