From 1a7ba7451735a2831acfb6fc05e230fca650fc2c Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sat, 2 Jul 2022 17:30:31 -0400 Subject: [PATCH] Fixes --- build.gradle | 2 +- .../com/volmit/iris/engine/EngineEditor.java | 66 ------------------- .../iris/engine/editor/pak/PakWriter.java | 2 +- 3 files changed, 2 insertions(+), 68 deletions(-) diff --git a/build.gradle b/build.gradle index b3cb01597..58ba505a3 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ allprojects { compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' implementation 'art.arcane.source:Source:22.6.9' - implementation 'art.arcane:Amulet:22.7.1' + implementation 'art.arcane:Amulet:22.7.2' implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1' annotationProcessor 'systems.manifold:manifold-ext:2022.1.18' testAnnotationProcessor 'systems.manifold:manifold-ext:2022.1.18' diff --git a/engine/src/main/java/com/volmit/iris/engine/EngineEditor.java b/engine/src/main/java/com/volmit/iris/engine/EngineEditor.java index 39bbfe5b8..8cb118ef8 100644 --- a/engine/src/main/java/com/volmit/iris/engine/EngineEditor.java +++ b/engine/src/main/java/com/volmit/iris/engine/EngineEditor.java @@ -45,71 +45,5 @@ public class EngineEditor { resolvableTypes.forEach(i -> i.apply(gsonBuilder)); this.gson = gsonBuilder.setPrettyPrinting().create(); i("Registered " + resolvableTypes.size() + " Mutators with " + resolvableTypes.stream().filter(i -> i instanceof TypeAdapterFactory).count() + " Type Adapter Factories"); - - i(gson.toJson(gson.fromJson("Noise.simplex(seed)", IrisGenerator.class))); - - System.out.println(gson.toJson(IrisDimension.builder() - .biome(IrisBiome.builder() - .name("Plains") - .surface(IrisSurface.builder() - .decorator(IrisDecorator.builder() - .palette(IrisPalette.flat("minecraft:grass")) - .chance(IrisChance.half(IrisGenerator.builder() - .java("Noise.static(seed)") - .seed(IrisSeed.builder() - .offset(67) - .build()) - .build())) - .build()) - .layer(IrisSurfaceLayer.builder() - .palette(IrisPalette.flat("minecraft:grass_block")) - .thickness(IrisRange.flat(1)) - .build()) - .layer(IrisSurfaceLayer.builder() - .palette(IrisPalette.builder() - .block("minecraft:dirt") - .block("minecraft:coarse_dirt") - .build()) - .thickness(IrisRange.builder() - .min(3) - .max(5) - .generator(IrisGenerator.builder() - .java("Noise.simplex(seed).warp(Noise.perlin(seed+1), 0.5, 9)") - .seed(IrisSeed.builder() - .offset(446) - .mode(IrisSeedSetMode.WORLD_OFFSET) - .build()) - .build()) - .build()) - .build()) - .layer(IrisSurfaceLayer.builder() - .palette(IrisPalette.builder() - .block("minecraft:stone") - .block("minecraft:granite") - .build()) - .thickness(IrisRange.builder() - .min(3) - .max(7) - .generator(IrisGenerator.builder() - .java("Noise.simplex(seed).warp(Noise.perlin(seed+1), 0.5, 9)") - .seed(IrisSeed.builder() - .offset(123) - .mode(IrisSeedSetMode.WORLD_OFFSET) - .build()) - .build()) - .build()) - .build()) - .build()) - .build()) - .meta(IrisDimensionMeta.builder() - .name("Overworld") - .description("The overworld generates stuff") - .version("3.0.0") - .author(IrisAuthor.builder() - .name("cyberpwn") - .social(Map.of("discord", "cyberpwn#1337")) - .build()) - .build()) - .build())); } } diff --git a/engine/src/main/java/com/volmit/iris/engine/editor/pak/PakWriter.java b/engine/src/main/java/com/volmit/iris/engine/editor/pak/PakWriter.java index e7ae59ce0..e8bc4a980 100644 --- a/engine/src/main/java/com/volmit/iris/engine/editor/pak/PakWriter.java +++ b/engine/src/main/java/com/volmit/iris/engine/editor/pak/PakWriter.java @@ -32,7 +32,7 @@ public class PakWriter { } public PakWriter(File folder, String name) throws IOException { - this(folder, name, 1MB); + this(folder, name, 1LMB); } public void write() throws IOException, UnserializableClassException, IllegalAccessException {