Skip to content

Commit 1e98105

Browse files
supermassimosupermassimo
committed
fixed compilation issues
1 parent e5c6480 commit 1e98105

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+495
-489
lines changed

‎build.gradle‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,15 @@ configurations {
8585
dependencies {
8686
implementation "net.neoforged:neoforge:${neo_version}"
8787

88-
implementation 'curse.maven:dynamictrees-252818:6360173'
88+
//implementation 'curse.maven:dynamictrees-252818:6360173'
89+
implementation ':dynamictrees-neoforge:1.21.1-1.5.0'
8990

9091
runtimeOnly 'curse.maven:jade-324717:6291517'
92+
runtimeOnly "curse.maven:jei-238222:5846880"
93+
94+
runtimeOnly "curse.maven:glitchcore-955399:5660740"
95+
runtimeOnly "curse.maven:serene-seasons-291874:5753503"
96+
runtimeOnly "curse.maven:patchouli-306770:6164617"
9197
}
9298

9399
tasks.withType(ProcessResources).configureEach {
@@ -102,6 +108,7 @@ tasks.withType(ProcessResources).configureEach {
102108
mod_license : mod_license,
103109
mod_version : mod_version,
104110
mod_authors : mod_authors,
111+
mod_credits : mod_credits,
105112
mod_description : mod_description
106113
]
107114
inputs.properties replaceProperties

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ mod_license=MIT
55
mod_version=1.3.0
66
mod_group_id=com.dtteam.dynamictreesplus
77
mod_authors=Ferreusveritas, Max Hyper, Harley O'Connor
8+
mod_credits=
89
mod_description=Vanilla addon for Dynamic Trees
910

1011
# Environment Properties

‎src/main/java/com/dtteam/dynamictreesplus/DynamicTreesPlus.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,19 @@
44
import com.dtteam.dynamictrees.block.leaves.LeavesProperties;
55
import com.dtteam.dynamictrees.block.soil.SoilProperties;
66
import com.dtteam.dynamictrees.data.GatherDataHelper;
7+
import com.dtteam.dynamictrees.data.builder.BranchLoaderBuilder;
78
import com.dtteam.dynamictrees.loot.DTLoot;
89
import com.dtteam.dynamictrees.registry.NeoForgeRegistryHandler;
910
import com.dtteam.dynamictrees.tree.family.Family;
1011
import com.dtteam.dynamictrees.tree.species.Species;
1112
import com.dtteam.dynamictrees.treepack.Resources;
1213
import com.dtteam.dynamictrees.worldgen.feature.DynamicTreeFeature;
1314
import com.dtteam.dynamictreesplus.block.mushroom.CapProperties;
14-
import com.dtteam.dynamictreesplus.init.DTPClient;
1515
import com.dtteam.dynamictreesplus.init.DTPConfigs;
1616
import com.dtteam.dynamictreesplus.init.DTPRegistries;
1717
import net.minecraft.resources.ResourceLocation;
1818
import net.neoforged.bus.api.IEventBus;
1919
import net.neoforged.fml.ModContainer;
20-
import net.neoforged.fml.ModLoadingContext;
2120
import net.neoforged.fml.common.Mod;
2221
import net.neoforged.fml.config.ModConfig;
2322
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
@@ -28,6 +27,8 @@
2827
public class DynamicTreesPlus {
2928

3029
public static final String MOD_ID = "dynamictreesplus";
30+
public static final ResourceLocation CACTUS = DynamicTreesPlus.location("cactus");
31+
public static final ResourceLocation MUSHROOM = DynamicTreesPlus.location("mushroom");
3132

3233
public DynamicTreesPlus(IEventBus modBus, ModContainer modContainer) {
3334

@@ -43,7 +44,6 @@ public DynamicTreesPlus(IEventBus modBus, ModContainer modContainer) {
4344
}
4445

4546
private void clientSetup(final FMLClientSetupEvent event) {
46-
DTPClient.setup();
4747
}
4848

4949
private void commonSetup(final FMLCommonSetupEvent event) {
@@ -58,6 +58,10 @@ private void commonSetup(final FMLCommonSetupEvent event) {
5858
}
5959

6060
private void gatherData(final GatherDataEvent event) {
61+
BranchLoaderBuilder.branchBuilders.put(
62+
CACTUS, (parent, existingFileHelper) ->
63+
new BranchLoaderBuilder(CACTUS, parent, existingFileHelper));
64+
6165
Resources.MANAGER.gatherData();
6266
GatherDataHelper.gatherAllData(MOD_ID, event,
6367
SoilProperties.REGISTRY,

‎src/main/java/com/dtteam/dynamictreesplus/block/CactusBranchBlock.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
package com.dtteam.dynamictreesplus.block;
22

33
import com.dtteam.dynamictrees.DynamicTrees;
4-
import com.dtteam.dynamictrees.api.TreeHelper;
54
import com.dtteam.dynamictrees.api.cell.Cell;
65
import com.dtteam.dynamictrees.api.cell.CellNull;
6+
import com.dtteam.dynamictrees.api.network.Connections;
77
import com.dtteam.dynamictrees.api.network.MapSignal;
88
import com.dtteam.dynamictrees.api.treedata.TreePart;
99
import com.dtteam.dynamictrees.block.branch.BranchBlock;
1010
import com.dtteam.dynamictrees.block.leaves.LeavesProperties;
11-
import com.dtteam.dynamictrees.block.rooty.RootyBlock;
12-
import com.dtteam.dynamictrees.growthlogic.context.DirectionSelectionContext;
11+
import com.dtteam.dynamictrees.block.soil.SoilBlock;
1312
import com.dtteam.dynamictrees.loot.DTLootParameterSets;
1413
import com.dtteam.dynamictrees.loot.entry.SeedItemLootPoolEntry;
15-
import com.dtteam.dynamictrees.loot.function.MultiplyLogsCount;
16-
import com.dtteam.dynamictrees.loot.function.MultiplySticksCount;
14+
import com.dtteam.dynamictrees.loot.function.MultiplyByLogsCount;
15+
import com.dtteam.dynamictrees.loot.function.MultiplyBySticksCount;
1716
import com.dtteam.dynamictrees.systems.GrowSignal;
17+
import com.dtteam.dynamictrees.systems.growthlogic.context.DirectionSelectionContext;
18+
import com.dtteam.dynamictrees.tree.ChunkTreeHelper;
19+
import com.dtteam.dynamictrees.tree.TreeHelper;
1820
import com.dtteam.dynamictrees.tree.species.Species;
19-
import com.dtteam.dynamictrees.util.Connections;
20-
import com.dtteam.dynamictrees.util.CoordUtils;
2121
import com.dtteam.dynamictreesplus.init.DTPConfigs;
2222
import com.dtteam.dynamictreesplus.tree.CactusSpecies;
2323
import com.google.common.base.Predicate;
2424
import net.minecraft.core.BlockPos;
2525
import net.minecraft.core.Direction;
26+
import net.minecraft.core.HolderLookup;
2627
import net.minecraft.resources.ResourceLocation;
2728
import net.minecraft.util.Mth;
2829
import net.minecraft.util.RandomSource;
2930
import net.minecraft.util.StringRepresentable;
30-
import net.minecraft.world.damagesource.DamageSources;
3131
import net.minecraft.world.entity.Entity;
3232
import net.minecraft.world.entity.LivingEntity;
3333
import net.minecraft.world.entity.item.ItemEntity;
@@ -51,7 +51,6 @@
5151
import net.minecraft.world.phys.shapes.Shapes;
5252
import net.minecraft.world.phys.shapes.VoxelShape;
5353

54-
5554
import javax.annotation.Nonnull;
5655
import javax.annotation.Nullable;
5756
import java.util.Objects;
@@ -338,16 +337,16 @@ public int getRadiusForConnection(BlockState blockState, BlockGetter blockAccess
338337
protected int getSideConnectionRadius(BlockGetter blockAccess, BlockPos pos, Direction side) {
339338
BlockPos deltaPos = pos.relative(side);
340339

341-
final BlockState otherState = CoordUtils.getStateSafe(blockAccess, deltaPos);
342-
final BlockState state = CoordUtils.getStateSafe(blockAccess, pos);
340+
final BlockState otherState = ChunkTreeHelper.getStateSafe(blockAccess, deltaPos);
341+
final BlockState state = ChunkTreeHelper.getStateSafe(blockAccess, pos);
343342

344343
// If the blocks aren't loaded, assume there is no connection.
345344
if (otherState == null || state == null || state.getBlock() != this)
346345
return 0;
347346

348347
if (otherState.getBlock() == this && (otherState.getValue(ORIGIN) == side.getOpposite() || state.getValue(ORIGIN) == side)) {
349348
return Math.min(getCactusRadius(state.getValue(TRUNK_TYPE)), getCactusRadius(otherState.getValue(TRUNK_TYPE)));
350-
} else if (side == Direction.DOWN && state.getValue(ORIGIN) == side && (otherState.getBlock() == this || otherState.getBlock() instanceof RootyBlock)) {
349+
} else if (side == Direction.DOWN && state.getValue(ORIGIN) == side && (otherState.getBlock() == this || otherState.getBlock() instanceof SoilBlock)) {
351350
return getCactusRadius(state.getValue(TRUNK_TYPE));
352351
}
353352

@@ -359,7 +358,7 @@ protected int getSideConnectionRadius(BlockGetter blockAccess, BlockPos pos, Dir
359358
///////////////////////////////////////////
360359

361360
@Override
362-
public MapSignal analyse(BlockState blockState, LevelAccessor world, BlockPos pos, Direction fromDir, MapSignal signal) {
361+
public MapSignal analyse(BlockState blockState, LevelAccessor world, BlockPos pos, @Nullable Direction fromDir, MapSignal signal) {
363362
// Note: fromDir will be null in the origin node
364363
if (signal.depth++ < 32) {// Prevents going too deep into large networks, or worse, being caught in a network loop
365364
BlockState state = world.getBlockState(pos);
@@ -395,17 +394,17 @@ public MapSignal analyse(BlockState blockState, LevelAccessor world, BlockPos po
395394
}
396395

397396
@Override
398-
public LootTable.Builder createBranchDrops() {
397+
public LootTable.Builder createBranchDrops(HolderLookup.Provider registries) {
399398
return LootTable.lootTable().withPool(
400399
LootPool.lootPool().setRolls(ConstantValue.exactly(1)).add(
401400
LootItem.lootTableItem(getPrimitiveLog().get())
402-
.apply(MultiplyLogsCount.multiplyLogsCount())
401+
.apply(MultiplyByLogsCount.multiplyByLogsCount())
403402
.apply(ApplyExplosionDecay.explosionDecay())
404403
)
405404
).withPool(
406405
LootPool.lootPool().setRolls(ConstantValue.exactly(1)).add(
407406
SeedItemLootPoolEntry.lootTableSeedItem()
408-
.apply(MultiplySticksCount.multiplySticksCount())
407+
.apply(MultiplyBySticksCount.multiplyBySticksCount())
409408
.apply(ApplyExplosionDecay.explosionDecay())
410409
)
411410
).setParamSet(DTLootParameterSets.BRANCHES);

‎src/main/java/com/dtteam/dynamictreesplus/block/CactusFruit.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.dtteam.dynamictreesplus.block;
22

3-
import com.dtteam.dynamictrees.api.TreeHelper;
43
import com.dtteam.dynamictrees.api.registry.TypedRegistry;
5-
import com.dtteam.dynamictrees.block.FruitBlock;
64
import com.dtteam.dynamictrees.block.branch.BranchBlock;
7-
import com.dtteam.dynamictrees.systems.fruit.Fruit;
5+
import com.dtteam.dynamictrees.block.fruit.Fruit;
6+
import com.dtteam.dynamictrees.block.fruit.FruitBlock;
7+
import com.dtteam.dynamictrees.tree.TreeHelper;
88
import net.minecraft.core.BlockPos;
99
import net.minecraft.core.Direction;
1010
import net.minecraft.resources.ResourceLocation;

‎src/main/java/com/dtteam/dynamictreesplus/block/CactusFruitBlock.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.dtteam.dynamictreesplus.block;
22

3-
import com.dtteam.dynamictrees.block.FruitBlock;
4-
import com.dtteam.dynamictrees.systems.fruit.Fruit;
3+
import com.dtteam.dynamictrees.block.fruit.Fruit;
4+
import com.dtteam.dynamictrees.block.fruit.FruitBlock;
55
import net.minecraft.core.BlockPos;
66
import net.minecraft.world.level.BlockGetter;
77
import net.minecraft.world.level.LevelReader;

‎src/main/java/com/dtteam/dynamictreesplus/block/mushroom/CapProperties.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.dtteam.dynamictrees.block.branch.BranchBlock;
1010
import com.dtteam.dynamictrees.data.DTDataProvider;
1111
import com.dtteam.dynamictrees.data.Generator;
12+
import com.dtteam.dynamictrees.deserialization.JsonDeserializers;
1213
import com.dtteam.dynamictrees.loot.DTLootContextParams;
1314
import com.dtteam.dynamictrees.loot.DTLootParameterSets;
1415
import com.dtteam.dynamictrees.loot.LootTableSupplier;
@@ -26,6 +27,7 @@
2627
import com.mojang.serialization.codecs.RecordCodecBuilder;
2728
import net.minecraft.core.BlockPos;
2829
import net.minecraft.core.Direction;
30+
import net.minecraft.core.HolderLookup;
2931
import net.minecraft.core.particles.ParticleOptions;
3032
import net.minecraft.core.particles.ParticleTypes;
3133
import net.minecraft.resources.ResourceLocation;
@@ -59,7 +61,7 @@
5961
public class CapProperties extends RegistryEntry<CapProperties> implements Resettable<CapProperties> {
6062

6163
public static final Codec<CapProperties> CODEC = RecordCodecBuilder.create(instance -> instance
62-
.group(ResourceLocation.CODEC.fieldOf(TypedRegistry.RESOURCE_LOCATION.toString()).forGetter(CapProperties::getRegistryName))
64+
.group(ResourceLocation.CODEC.fieldOf(JsonDeserializers.RESOURCE_LOCATION.toString()).forGetter(CapProperties::getRegistryName))
6365
.apply(instance, CapProperties::new));
6466

6567
public static final CapProperties NULL = new CapProperties() {
@@ -378,11 +380,11 @@ public boolean shouldGenerateBlockDrops() {
378380
return shouldGenerateDrops();
379381
}
380382

381-
public LootTable.Builder createBlockDrops() {
383+
public LootTable.Builder createBlockDrops(HolderLookup.Provider registries) {
382384
if (getPrimitiveCapBlock().isPresent()) {
383-
return DTPLootTableHandler.createCapBlockDrops(primitiveCap.getBlock(), getMushroomItem(), -6, 2);
385+
return DTPLootTableHandler.createCapBlockDrops(primitiveCap.getBlock(), getMushroomItem(), -6, 2, registries);
384386
}
385-
return DTPLootTableHandler.createCapDrops(primitiveCap.getBlock(), getMushroomItem(), LootContextParamSets.BLOCK);
387+
return DTPLootTableHandler.createCapDrops(primitiveCap.getBlock(), getMushroomItem(), LootContextParamSets.BLOCK, registries);
386388
}
387389

388390
private final LootTableSupplier lootTableSupplier;
@@ -399,8 +401,8 @@ public boolean shouldGenerateDrops() {
399401
return getPrimitiveCapBlock().isPresent();
400402
}
401403

402-
public LootTable.Builder createDrops() {
403-
return DTPLootTableHandler.createCapDrops(primitiveCap.getBlock(), getMushroomItem(), DTLootParameterSets.LEAVES);
404+
public LootTable.Builder createDrops(HolderLookup.Provider registries) {
405+
return DTPLootTableHandler.createCapDrops(primitiveCap.getBlock(), getMushroomItem(), DTLootParameterSets.LEAVES, registries);
404406
}
405407

406408
public List<ItemStack> getDrops(Level level, BlockPos pos, ItemStack tool, Species species) {

‎src/main/java/com/dtteam/dynamictreesplus/block/mushroom/DynamicCapBlock.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.dtteam.dynamictrees.systems.GrowSignal;
1010
import com.dtteam.dynamictrees.tree.family.Family;
1111
import com.dtteam.dynamictreesplus.systems.mushroomlogic.MushroomCapDisc;
12+
import net.minecraft.world.level.LevelReader;
1213
import net.minecraft.world.phys.Vec3;
1314
import net.minecraft.core.BlockPos;
1415
import net.minecraft.core.Direction;
@@ -122,7 +123,7 @@ public TreePartType getTreePartType() {
122123
}
123124

124125
@Override
125-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) {
126+
public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) {
126127
return getProperties(state).getPrimitiveCapItemStack();
127128
}
128129

‎src/main/java/com/dtteam/dynamictreesplus/block/mushroom/DynamicCapCenterBlock.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.dtteam.dynamictreesplus.block.mushroom;
22

3-
import com.dtteam.dynamictrees.api.TreeHelper;
43
import com.dtteam.dynamictrees.api.cell.Cell;
54
import com.dtteam.dynamictrees.api.cell.CellNull;
65
import com.dtteam.dynamictrees.api.network.MapSignal;
76
import com.dtteam.dynamictrees.api.treedata.TreePart;
87
import com.dtteam.dynamictrees.block.branch.BranchBlock;
98
import com.dtteam.dynamictrees.block.leaves.LeavesProperties;
10-
import com.dtteam.dynamictrees.data.DTBlockTags;
9+
import com.dtteam.dynamictrees.data.tags.DTBlockTags;
1110
import com.dtteam.dynamictrees.systems.GrowSignal;
1211
import com.dtteam.dynamictrees.systems.poissondisc.Vec2i;
12+
import com.dtteam.dynamictrees.tree.TreeHelper;
1313
import com.dtteam.dynamictrees.tree.family.Family;
1414
import com.dtteam.dynamictrees.tree.species.Species;
1515
import com.dtteam.dynamictreesplus.systems.mushroomlogic.MushroomCapDisc;
@@ -23,6 +23,7 @@
2323
import net.minecraft.world.level.BlockGetter;
2424
import net.minecraft.world.level.Level;
2525
import net.minecraft.world.level.LevelAccessor;
26+
import net.minecraft.world.level.LevelReader;
2627
import net.minecraft.world.level.block.Block;
2728
import net.minecraft.world.level.block.Blocks;
2829
import net.minecraft.world.level.block.state.BlockState;
@@ -136,7 +137,7 @@ public BlockState getCapBlockStateForPlacement(LevelAccessor level, BlockPos pos
136137
}
137138

138139
@Override
139-
public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) {
140+
public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) {
140141
return getProperties(state).getPrimitiveCapItemStack();
141142
}
142143

‎src/main/java/com/dtteam/dynamictreesplus/block/mushroom/MushroomBranchBlock.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
import com.dtteam.dynamictrees.DynamicTrees;
44
import com.dtteam.dynamictrees.api.cell.Cell;
55
import com.dtteam.dynamictrees.api.cell.CellNull;
6+
import com.dtteam.dynamictrees.api.network.BranchDestructionData;
67
import com.dtteam.dynamictrees.api.network.MapSignal;
8+
import com.dtteam.dynamictrees.api.voxmap.BlockPosBounds;
9+
import com.dtteam.dynamictrees.api.voxmap.SimpleVoxmap;
710
import com.dtteam.dynamictrees.block.branch.ThickBranchBlock;
811
import com.dtteam.dynamictrees.block.leaves.LeavesProperties;
912
import com.dtteam.dynamictrees.systems.GrowSignal;
@@ -12,22 +15,20 @@
1215
import com.dtteam.dynamictrees.systems.nodemapper.SpeciesNode;
1316
import com.dtteam.dynamictrees.systems.nodemapper.StateNode;
1417
import com.dtteam.dynamictrees.tree.species.Species;
15-
import com.dtteam.dynamictrees.util.BlockBounds;
16-
import com.dtteam.dynamictrees.util.BlockStates;
17-
import com.dtteam.dynamictrees.util.BranchDestructionData;
18-
import com.dtteam.dynamictrees.util.SimpleVoxmap;
1918
import com.dtteam.dynamictreesplus.data.DTPLootTableHandler;
2019
import com.dtteam.dynamictreesplus.systems.mushroomlogic.context.MushroomCapContext;
2120
import com.dtteam.dynamictreesplus.tree.HugeMushroomFamily;
2221
import com.dtteam.dynamictreesplus.tree.HugeMushroomSpecies;
2322
import net.minecraft.core.BlockPos;
2423
import net.minecraft.core.Direction;
24+
import net.minecraft.core.HolderLookup;
2525
import net.minecraft.resources.ResourceLocation;
2626
import net.minecraft.world.entity.LivingEntity;
2727
import net.minecraft.world.entity.player.Player;
2828
import net.minecraft.world.item.ItemStack;
2929
import net.minecraft.world.level.BlockGetter;
3030
import net.minecraft.world.level.Level;
31+
import net.minecraft.world.level.block.Blocks;
3132
import net.minecraft.world.level.block.state.BlockState;
3233
import net.minecraft.world.level.storage.loot.LootTable;
3334
import org.jetbrains.annotations.NotNull;
@@ -109,7 +110,7 @@ public BranchDestructionData destroyBranchFromNode(Level level, BlockPos cutPos,
109110
cutDir = Direction.DOWN;
110111
}
111112

112-
return new BranchDestructionData(species, stateMapper.getBranchConnectionMap(), destroyedLeaves, leavesDropsList, endPoints, volumeSum.getVolume(), cutPos, cutDir, toolDir, trunkHeight);
113+
return new BranchDestructionData(species, stateMapper.getBranchConnectionMap(), destroyedLeaves, leavesDropsList, endPoints, volumeSum.getVolume(), cutPos, cutPos, cutDir, toolDir, trunkHeight);
113114
}
114115

115116
//Method is called destroy leaves but this one is to destroy mushroom caps
@@ -122,7 +123,7 @@ public void destroyMushroomCap(final @NotNull Level level, final @NotNull BlockP
122123
}
123124

124125
// Make a bounding volume that holds all the endpoints and expand the volume for the leaves' radius.
125-
final BlockBounds bounds = getFamily().expandLeavesBlockBounds(new BlockBounds(endPoints));
126+
final BlockPosBounds bounds = getFamily().expandLeavesBlockBounds(new BlockPosBounds(endPoints));
126127

127128
// Create a voxmap to store the leaf destruction map.
128129
final SimpleVoxmap capMap = new SimpleVoxmap(bounds);
@@ -144,7 +145,7 @@ public void destroyMushroomCap(final @NotNull Level level, final @NotNull BlockP
144145
final List<ItemStack> dropList = new ArrayList<>();
145146

146147
// Destroy all family compatible leaves.
147-
for (final SimpleVoxmap.Cell cell : capMap.getAllNonZeroCells()) {
148+
for (final SimpleVoxmap.VoxmapCell cell : capMap.getAllNonZeroCells()) {
148149
final BlockPos.MutableBlockPos pos = cell.getPos();
149150
final BlockState state = level.getBlockState(pos);
150151
if (family.isCompatibleCap(mushSpecies, state, level, pos)) {
@@ -153,7 +154,7 @@ public void destroyMushroomCap(final @NotNull Level level, final @NotNull BlockP
153154
dropList.addAll(cap.getDrops(level, pos, tool, species));
154155
final BlockPos imPos = pos.immutable(); // We are storing this so it must be immutable
155156
final BlockPos relPos = imPos.subtract(cutPos);
156-
level.setBlock(imPos, BlockStates.AIR, 3);
157+
level.setBlock(imPos, Blocks.AIR.defaultBlockState(), 3);
157158
destroyedCapBlocks.put(relPos, state);
158159
dropList.forEach(i -> drops.add(new ItemStackPos(i, relPos)));
159160
}
@@ -173,8 +174,9 @@ private CapProperties getCapProperties (BlockState state){
173174
return CapProperties.NULL;
174175
}
175176

176-
public LootTable.Builder createBranchDrops() {
177-
return DTPLootTableHandler.createMushroomBranchDrops(getPrimitiveLog().get());
177+
@Override
178+
public LootTable.Builder createBranchDrops(HolderLookup.Provider registries) {
179+
return DTPLootTableHandler.createMushroomBranchDrops(getPrimitiveLog().get(), registries);
178180
}
179181

180182
}

0 commit comments

Comments
 (0)