Clean up & Format

This commit is contained in:
LOOHP
2024-03-25 22:03:24 +00:00
parent 01d2a3e528
commit 8ec7d322d8
11 changed files with 720 additions and 748 deletions
@@ -37,24 +37,16 @@ public class DimensionRegistry {
private CompoundTag defaultTag;
private CompoundTag codec;
private File reg;
public DimensionRegistry() {
this.defaultTag = new CompoundTag();
String name = "dimension_registry.json";
File file = new File(Limbo.getInstance().getInternalDataFolder(), name);
if (!file.exists()) {
try (InputStream in = Limbo.class.getClassLoader().getResourceAsStream(name)) {
Files.copy(in, file.toPath());
} catch (IOException e) {
e.printStackTrace();
}
}
this.reg = file;
try (InputStreamReader reader = new InputStreamReader(Files.newInputStream(reg.toPath()), StandardCharsets.UTF_8)) {
InputStream inputStream = Limbo.class.getClassLoader().getResourceAsStream(name);
if (inputStream == null) {
throw new RuntimeException("Failed to load " + name + " from jar!");
}
try (InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) {
JSONObject json = (JSONObject) new JSONParser().parse(reader);
CompoundTag tag = CustomNBTUtils.getCompoundTagFromJson((JSONObject) json.get("value"));
defaultTag = tag;
@@ -64,10 +56,6 @@ public class DimensionRegistry {
}
}
public File getFile() {
return reg;
}
public void resetCodec() {
codec = defaultTag.clone();
}
@@ -30,6 +30,8 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.HashMap;
import java.util.Map;
@@ -41,17 +43,12 @@ public class GeneratedBlockDataMappings {
static {
String block = "blocks.json";
File file = new File(Limbo.getInstance().getInternalDataFolder(), block);
if (!file.exists()) {
try (InputStream in = Limbo.class.getClassLoader().getResourceAsStream(block)) {
Files.copy(in, file.toPath());
} catch (IOException e) {
e.printStackTrace();
}
}
try {
globalPalette = (JSONObject) new JSONParser().parse(new FileReader(file));
InputStream inputStream = Limbo.class.getClassLoader().getResourceAsStream(block);
if (inputStream == null) {
throw new RuntimeException("Failed to load " + block + " from jar!");
}
try (InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8)) {
globalPalette = (JSONObject) new JSONParser().parse(reader);
} catch (IOException | ParseException e) {
e.printStackTrace();
}