upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify tree grower patches (#9209)

Browse Source
This commit is contained in:
eerussianguy authored and GitHub committed 2022-12-12 10:23:32 -08:00
1 parent 4802ceeccc
commit e6c7958456
4 files changed
+27 -60
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/event/ForgeEventFactory.java
+1 -1
View File
@@ -624,7 +624,7 @@ public class ForgeEventFactory
return !blockGrowFeature(level, randomSource, pos, null).getResult().equals(Result.DENY);
}
public static SaplingGrowTreeEvent blockGrowFeature(LevelAccessor level, RandomSource randomSource, BlockPos pos, @Nullable Holder<? extends ConfiguredFeature<?, ?>> holder)
public static SaplingGrowTreeEvent blockGrowFeature(LevelAccessor level, RandomSource randomSource, BlockPos pos, @Nullable Holder<ConfiguredFeature<?, ?>> holder)
{
SaplingGrowTreeEvent event = new SaplingGrowTreeEvent(level, randomSource, pos, holder);
MinecraftForge.EVENT_BUS.post(event);
src/main/java/net/minecraftforge/event/level/SaplingGrowTreeEvent.java
+14 -5
View File
@@ -40,7 +40,7 @@ public class SaplingGrowTreeEvent extends LevelEvent
private final RandomSource randomSource;
private final BlockPos pos;
@Nullable
private Holder<? extends ConfiguredFeature<?, ?>> feature;
private Holder<ConfiguredFeature<?, ?>> feature;
@Deprecated(forRemoval = true, since = "1.19.2")
public SaplingGrowTreeEvent(LevelAccessor level, RandomSource randomSource, BlockPos pos)
@@ -48,7 +48,7 @@ public class SaplingGrowTreeEvent extends LevelEvent
this(level, randomSource, pos, null);
}
public SaplingGrowTreeEvent(LevelAccessor level, RandomSource randomSource, BlockPos pos, @Nullable Holder<? extends ConfiguredFeature<?, ?>> feature)
public SaplingGrowTreeEvent(LevelAccessor level, RandomSource randomSource, BlockPos pos, @Nullable Holder<ConfiguredFeature<?, ?>> feature)
{
super(level);
this.randomSource = randomSource;
@@ -76,15 +76,24 @@ public class SaplingGrowTreeEvent extends LevelEvent
* {@return the holder of the feature which will be placed, possibly null}
*/
@Nullable
public Holder<? extends ConfiguredFeature<?, ?>> getFeature() {
public Holder<ConfiguredFeature<?, ?>> getFeature()
{
return feature;
}
public void setFeature(@Nullable Holder<? extends ConfiguredFeature<?, ?>> feature) {
/**
* @param feature a {@linkplain Holder} referencing a tree feature to be placed instead of the current feature.
*/
public void setFeature(@Nullable Holder<ConfiguredFeature<?, ?>> feature)
{
this.feature = feature;
}
public void setFeature(ResourceKey<ConfiguredFeature<?, ?>> featureKey) {
/**
* @param featureKey a {@linkplain ResourceKey} referencing a tree feature to be placed instead of the current feature.
*/
public void setFeature(ResourceKey<ConfiguredFeature<?, ?>> featureKey)
{
this.feature = this.getLevel().registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).getHolder(featureKey).orElse(null);
}
}