Skip to content

Commit caeba75

Browse files
committed
Use stripped biomes (no chunk gen data)
1 parent 81b5c64 commit caeba75

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

server/src/main/java/org/cloudburstmc/server/item/ItemUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,9 @@ private static ItemData.Builder toNetworkBuilder(ItemStack item) {
210210
try {
211211
blockDefinition = item.getBlockState().map(CloudBlockRegistry.REGISTRY::getDefinition).orElse(null);
212212
} catch (IllegalArgumentException e) {
213-
log.debug("Block state not registered for item: {}", identifier);
213+
// Block state exists but doesn't have a definition in the vanilla palette
214+
// This can happen when creative_items.json has block states that were merged
215+
// but don't exist as exact matches in block_palette.nbt
214216
}
215217
NbtMap tag = ItemUtils.getSerializedTag(item);
216218

server/src/main/java/org/cloudburstmc/server/level/biome/CloudBiome.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ public class CloudBiome implements Biome {
2626
public static final NoiseSource TEMPERATURE_NOISE = new PerlinNoiseEngine(new FastPRandom(123456789L));
2727

2828
static {
29-
InputStream inputStream = Bootstrap.class.getClassLoader().getResourceAsStream("data/biome_definitions.json");
29+
InputStream inputStream = Bootstrap.class.getClassLoader().getResourceAsStream("data/stripped_biome_definitions.json");
3030
if (inputStream == null) {
31-
throw new AssertionError("Could not find biome_definitions.json");
31+
throw new AssertionError("Could not find stripped_biome_definitions.json");
3232
}
3333
try {
3434
Map<String, BiomeDefinitionData> biomes = Bootstrap.JSON_MAPPER.readValue(
3535
inputStream, new TypeReference<Map<String, BiomeDefinitionData>>() {});
3636
BIOME_DEFINITIONS = new BiomeDefinitions(biomes);
3737
} catch (Exception e) {
38-
throw new AssertionError("Error whilst loading biome_definitions.json", e);
38+
throw new AssertionError("Error whilst loading stripped_biome_definitions.json", e);
3939
}
4040
}
4141

0 commit comments

Comments
 (0)