Skip to content

for some reason never noticed that the code got broke during one of t… #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jriwanek merged 1 commit into from
Jul 7, 2017
Merged

for some reason never noticed that the code got broke during one of t… #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 16 additions & 7 deletions src/main/java/com/mcmoddev/orespawn/json/OS3Writer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import org.apache.commons.io.FileUtils;

import com.google.common.collect.ImmutableList;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
Expand Down Expand Up @@ -50,13 +51,7 @@ public void writeSpawnEntries() {
dimension.addProperty(ConfigNames.DIMENSION, String.format("%d", dim.getKey()));
}

JsonArray spawns = new JsonArray();

dim.getValue().getAllSpawns().stream().filter( spawn -> !spawn.getOres().isEmpty() )
.filter(spawn -> spawn.getOres().get(0).getOre() != null )
.filter(spawn -> "minecraft:air".equals(spawn.getOres().get(0).getOre().getBlock().getRegistryName().toString()))
.map( this::genSpawn )
.forEach( spawns::add );
JsonArray spawns = this.genSpawns(dim.getValue().getAllSpawns());

if( spawns.size() > 0 ) {
dimension.add(ConfigNames.ORES, spawns);
Expand All @@ -74,6 +69,19 @@ public void writeSpawnEntries() {
});
}

private JsonArray genSpawns(ImmutableList<SpawnBuilder> allSpawns) {
JsonArray rv = new JsonArray();
for( SpawnBuilder spawn : allSpawns ) {
if( spawn.getOres().isEmpty() ||
spawn.getOres().get(0).getOre() == null ||
"minecraft:air".equals(spawn.getOres().get(0).getOre().getBlock().getRegistryName().toString()) ) {
continue;
}
rv.add( this.genSpawn(spawn) );
}
return rv;
}

private void writeFile(File file, JsonObject wrapper) {
Gson gson = new GsonBuilder().setPrettyPrinting().create();
try {
Expand All @@ -90,6 +98,7 @@ private JsonObject genSpawn(SpawnBuilder spawn) {
String blockName = spawn.getOres().get(0).getOre().getBlock().getRegistryName().toString();

ore.addProperty(ConfigNames.BLOCK, blockName);

String state = StateUtil.serializeState(spawn.getOres().get(0).getOre());
if( !ConfigNames.STATE_NORMAL.equals(state) ) {
ore.addProperty(ConfigNames.STATE, state);
Expand Down