Implement hasTag onto BiomeContext (#272)

* Implement hasTag onto BiomeContext
* Improve optional handling

[norelease] to allow for version bumping and reformatting before release

(cherry picked from commit 16a7d23602)
This commit is contained in:
itsmeow
2022-06-10 01:47:34 +08:00
committed by shedaniel
parent dfce9f247d
commit 81f4de28ba
6 changed files with 37 additions and 8 deletions

View File

@@ -23,9 +23,15 @@ import com.google.common.collect.Lists;
import dev.architectury.forge.ArchitecturyForge;
import dev.architectury.hooks.level.biome.*;
import dev.architectury.registry.level.biome.BiomeModifications.BiomeContext;
import dev.architectury.utils.GameInstance;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.sounds.Music;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.tags.TagKey;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.level.biome.Biome;
@@ -43,6 +49,7 @@ import org.apache.commons.lang3.tuple.Pair;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.BiConsumer;
import java.util.function.BiPredicate;
import java.util.function.Predicate;
@@ -83,6 +90,21 @@ public class BiomeModificationsImpl {
public BiomeProperties getProperties() {
return properties;
}
@Override
public boolean hasTag(TagKey<Biome> tag) {
MinecraftServer server = GameInstance.getServer();
if (server != null) {
Optional<? extends Registry<Biome>> registry = server.registryAccess().registry(Registry.BIOME_REGISTRY);
if (registry.isPresent()) {
Optional<Holder<Biome>> holder = registry.get().getHolder(ResourceKey.create(Registry.BIOME_REGISTRY, event.getName()));
if (holder.isPresent()) {
return holder.get().is(tag);
}
}
}
return false;
}
};
}