Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import net.ess3.provider.providers.FixedHeightWorldInfoProvider;
import net.ess3.provider.providers.FlatSpawnEggProvider;
import net.ess3.provider.providers.LegacyBannerDataProvider;
import net.ess3.provider.providers.LegacyBiomeNameProvider;
import net.ess3.provider.providers.LegacyDamageEventProvider;
import net.ess3.provider.providers.LegacyInventoryViewProvider;
import net.ess3.provider.providers.LegacyItemUnbreakableProvider;
Expand Down Expand Up @@ -373,6 +374,9 @@ public void onEnable() {
// Inventory View Provider
providerFactory.registerProvider(LegacyInventoryViewProvider.class, BaseInventoryViewProvider.class);

// Biome Name Provider
providerFactory.registerProvider(LegacyBiomeNameProvider.class);

// Biome Key Provider
providerFactory.registerProvider(PaperBiomeKeyProvider.class);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.earth2me.essentials.utils.VersionUtil;
import io.papermc.lib.PaperLib;
import net.ess3.provider.BiomeKeyProvider;
import net.ess3.provider.BiomeNameProvider;
import net.ess3.provider.WorldInfoProvider;
import org.bukkit.Location;
import org.bukkit.Material;
Expand Down Expand Up @@ -238,8 +239,9 @@ private boolean isValidRandomLocation(final Location location) {

// Exclude biome if enum or namespaced key matches
private boolean isExcludedBiome(final Location location) {
final BiomeNameProvider biomeNameProvider = ess.provider(BiomeNameProvider.class);
final Set<String> excluded = getExcludedBiomes();
final String enumKey = location.getBlock().getBiome().name().toLowerCase();
final String enumKey = biomeNameProvider.getBiomeName(location.getBlock());
// Try with good old bukkit enum
if (excluded.contains(enumKey)) {
return true;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package net.ess3.provider.providers;

import net.ess3.provider.BiomeNameProvider;
import net.essentialsx.providers.ProviderData;
import org.bukkit.block.Block;

import java.util.Locale;

@ProviderData(description = "Legacy Biome Name Provider")
public class LegacyBiomeNameProvider implements BiomeNameProvider {
@Override
public String getBiomeName(final Block block) {
// For some reason, compiling against modern versions causes this call to break, possibly related to OldEnum?
// Compiling this against versions that still have proper enums allow this to work
return block.getBiome().name().toLowerCase(Locale.ENGLISH);
Comment thread
JRoy marked this conversation as resolved.
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package net.ess3.provider;

import org.bukkit.block.Block;

public interface BiomeNameProvider extends Provider {
String getBiomeName(Block block);
}
Loading