Skip to content

Commit 58c0aec

Browse files
committed
Update bedrock-data
1 parent e8be6aa commit 58c0aec

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

composer.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/network/mcpe/cache/StaticPacketCache.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private static function loadBiomeDefinitionModel(string $filePath) : array{
6464
$jsonMapper->bStrictObjectTypeChecking = true;
6565

6666
$entries = [];
67-
foreach($biomeEntries as $entry){
67+
foreach($biomeEntries as $biomeName => $entry){
6868
if(!is_object($entry)){
6969
throw new SavedDataLoadingException("$filePath should be an array of objects, got " . get_debug_type($entry));
7070
}
@@ -74,7 +74,7 @@ private static function loadBiomeDefinitionModel(string $filePath) : array{
7474

7575
$mapWaterColour = $biomeDefinition->mapWaterColour;
7676
$entries[] = new BiomeDefinitionEntry(
77-
$biomeDefinition->name,
77+
$biomeName,
7878
$biomeDefinition->id,
7979
$biomeDefinition->temperature,
8080
$biomeDefinition->downfall,

src/world/biome/model/BiomeDefinitionEntryData.php

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* Model for loading biome definition entries data from JSON.
2828
*/
2929
final class BiomeDefinitionEntryData implements \JsonSerializable{
30-
public string $name;
3130
public ?int $id;
3231
public float $temperature;
3332
public float $downfall;

tools/generate-bedrock-data-from-packets.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,6 @@ public function handleBiomeDefinitionList(BiomeDefinitionListPacket $packet) : b
583583
$mapWaterColor->a = $entry->getMapWaterColor()->getA();
584584

585585
$data = new BiomeDefinitionEntryData();
586-
$data->name = $entry->getBiomeName();
587586
$data->id = $entry->getId();
588587
$data->temperature = round($entry->getTemperature(), 3);
589588
$data->downfall = round($entry->getDownfall(), 3);
@@ -597,9 +596,11 @@ public function handleBiomeDefinitionList(BiomeDefinitionListPacket $packet) : b
597596
$data->rain = $entry->hasRain();
598597
$data->tags = $entry->getTags() ?? [];
599598

600-
$definitions[] = self::objectToOrderedArray($data);
599+
$definitions[$entry->getBiomeName()] = self::objectToOrderedArray($data);
601600
}
602601

602+
ksort($definitions, SORT_STRING);
603+
603604
file_put_contents($this->bedrockDataPath . '/biome_definitions.json', json_encode($definitions, JSON_PRETTY_PRINT) . "\n");
604605

605606
return true;

0 commit comments

Comments
 (0)