Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-23 11:15:24 +01:00
Code Issues Projects Releases Wiki Activity

Addres Biome's changes in Minecraft 1.18. (#1893)

Browse Source 
Since Minecraft 1.18 renamed and removed a lot of biomes, some addons that stored them in the database may require migration.

This Adapter will fix that as now BentoBox itself will do migration for all Biome.class objects.
This commit is contained in:
BONNe 2021-12-19 18:49:29 +02:00 committed by GitHub
parent 2e6ef59040
commit ed50765b98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 102 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/world/bentobox/bentobox/database/json/BentoboxTypeAdapterFactory.java
View File

@ -4,6 +4,7 @@ import java.util.Map;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
@ -16,14 +17,8 @@ import com.google.gson.reflect.TypeToken;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.flags.Flag; import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.database.json.adapters.BukkitObjectTypeAdapter; import world.bentobox.bentobox.database.json.adapters.*;
import world.bentobox.bentobox.database.json.adapters.EnumTypeAdapter;
import world.bentobox.bentobox.database.json.adapters.FlagTypeAdapter;
import world.bentobox.bentobox.database.json.adapters.ItemStackTypeAdapter;
import world.bentobox.bentobox.database.json.adapters.LocationTypeAdapter;
import world.bentobox.bentobox.database.json.adapters.PotionEffectTypeAdapter;
import world.bentobox.bentobox.database.json.adapters.VectorTypeAdapter;
import world.bentobox.bentobox.database.json.adapters.WorldTypeAdapter;
/** /**
* Allocates type adapters based on class type. * Allocates type adapters based on class type.
@ -52,6 +47,8 @@ public class BentoboxTypeAdapterFactory implements TypeAdapterFactory {
if (Location.class.isAssignableFrom(rawType)) { if (Location.class.isAssignableFrom(rawType)) {
// Use our current location adapter for backward compatibility // Use our current location adapter for backward compatibility
return (TypeAdapter<T>) new LocationTypeAdapter(); return (TypeAdapter<T>) new LocationTypeAdapter();
} else if (Biome.class.isAssignableFrom(rawType)) {
return (TypeAdapter<T>) new BiomeTypeAdapter();
} else if (Enum.class.isAssignableFrom(rawType)) { } else if (Enum.class.isAssignableFrom(rawType)) {
return new EnumTypeAdapter(rawType); return new EnumTypeAdapter(rawType);
} else if (ItemStack.class.isAssignableFrom(rawType)) { } else if (ItemStack.class.isAssignableFrom(rawType)) {

97
src/main/java/world/bentobox/bentobox/database/json/adapters/BiomeTypeAdapter.java Normal file
View File

@ -0,0 +1,97 @@
//
// Created by BONNe
// Copyright - 2021
//
package world.bentobox.bentobox.database.json.adapters;
import com.google.gson.TypeAdapter;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import org.bukkit.block.Biome;
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* Minecraft 1.18 reworked their biomes, and a lot of things were renamed or removed.
* This adapter will address these changes in each database object, instead of manually fining it
* per implementation.
*/
public final class BiomeTypeAdapter extends TypeAdapter<Biome>
{
/**
* Map that contains string value to the actual Biome enum object.
*/
final Map<String, Biome> biomeMap;
public BiomeTypeAdapter() {
this.biomeMap = new HashMap<>();
// Put in current values.
Arrays.stream(Biome.values()).forEach(biome -> this.biomeMap.put(biome.name(), biome));
// Put in renamed biomes values.
this.biomeMap.put("TALL_BIRCH_FOREST", Biome.OLD_GROWTH_BIRCH_FOREST);
this.biomeMap.put("GIANT_TREE_TAIGA", Biome.OLD_GROWTH_PINE_TAIGA);
this.biomeMap.put("GIANT_SPRUCE_TAIGA", Biome.OLD_GROWTH_SPRUCE_TAIGA);
this.biomeMap.put("SNOWY_TUNDRA", Biome.SNOWY_PLAINS);
this.biomeMap.put("JUNGLE_EDGE", Biome.SPARSE_JUNGLE);
this.biomeMap.put("STONE_SHORE", Biome.STONY_SHORE);
this.biomeMap.put("MOUNTAINS", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("WOODED_MOUNTAINS", Biome.WINDSWEPT_FOREST);
this.biomeMap.put("GRAVELLY_MOUNTAINS", Biome.WINDSWEPT_GRAVELLY_HILLS);
this.biomeMap.put("SHATTERED_SAVANNA", Biome.WINDSWEPT_SAVANNA);
this.biomeMap.put("WOODED_BADLANDS_PLATEAU", Biome.WOODED_BADLANDS);
// Put in removed biomes values. BONNe chose some close enough values.
this.biomeMap.put("SNOWY_MOUNTAINS", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("DESERT_HILLS", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("MOUNTAIN_EDGE", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("SNOWY_TAIGA_HILLS", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("TAIGA_HILLS", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("TAIGA_MOUNTAINS", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("SNOWY_TAIGA_MOUNTAINS", Biome.WINDSWEPT_HILLS);
this.biomeMap.put("WOODED_HILLS", Biome.WINDSWEPT_FOREST);
this.biomeMap.put("SWAMP_HILLS", Biome.WINDSWEPT_FOREST);
this.biomeMap.put("DARK_FOREST_HILLS", Biome.WINDSWEPT_FOREST);
this.biomeMap.put("JUNGLE_HILLS", Biome.SPARSE_JUNGLE);
this.biomeMap.put("MODIFIED_JUNGLE", Biome.SPARSE_JUNGLE);
this.biomeMap.put("MODIFIED_JUNGLE_EDGE", Biome.SPARSE_JUNGLE);
this.biomeMap.put("BAMBOO_JUNGLE_HILLS", Biome.SPARSE_JUNGLE);
this.biomeMap.put("BIRCH_FOREST_HILLS", Biome.OLD_GROWTH_BIRCH_FOREST);
this.biomeMap.put("TALL_BIRCH_HILLS", Biome.OLD_GROWTH_BIRCH_FOREST);
this.biomeMap.put("GIANT_TREE_TAIGA_HILLS", Biome.OLD_GROWTH_PINE_TAIGA);
this.biomeMap.put("GIANT_SPRUCE_TAIGA_HILLS", Biome.OLD_GROWTH_SPRUCE_TAIGA);
this.biomeMap.put("MUSHROOM_FIELD_SHORE", Biome.MUSHROOM_FIELDS);
this.biomeMap.put("BADLANDS_PLATEAU", Biome.BADLANDS);
this.biomeMap.put("MODIFIED_WOODED_BADLANDS_PLATEAU", Biome.BADLANDS);
this.biomeMap.put("MODIFIED_BADLANDS_PLATEAU", Biome.BADLANDS);
this.biomeMap.put("SHATTERED_SAVANNA_PLATEAU", Biome.SAVANNA_PLATEAU);
this.biomeMap.put("DESERT_LAKES", Biome.DESERT);
this.biomeMap.put("MODIFIED_GRAVELLY_MOUNTAINS", Biome.WINDSWEPT_GRAVELLY_HILLS);
this.biomeMap.put("DEEP_WARM_OCEAN", Biome.DEEP_LUKEWARM_OCEAN);
}
@Override
public Biome read(JsonReader input) throws IOException
{
if (JsonToken.NULL.equals(input.peek())) {
input.nextNull();
return null;
}
return this.biomeMap.get(input.nextString().toUpperCase());
}
@Override
public void write(JsonWriter output, Biome enumValue) throws IOException {
output.value(enumValue != null ? enumValue.name() : null);
}
}