From d29f51c509ef3c3cf8de20be8cd86ae96ce45268 Mon Sep 17 00:00:00 2001 From: austin Date: Sun, 4 May 2025 18:20:42 -0400 Subject: [PATCH] recipe adjustment + gen change --- assets/Data/game/biomes.json | 2 +- assets/Data/game/recipes/voxelrecipes.json | 18 +++++++++++++++++- docs/src/progress/renderertodo.md | 1 + .../terrain/editing/TerrainEditing.java | 3 +++ .../generation/voxelphase/NoiseVoxelGen.java | 2 +- 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/assets/Data/game/biomes.json b/assets/Data/game/biomes.json index f26f8166..74438522 100644 --- a/assets/Data/game/biomes.json +++ b/assets/Data/game/biomes.json @@ -61,7 +61,7 @@ ], "surfaceGenerationParams": { "surfaceGenTag": "plains", - "heightOffset": 20, + "heightOffset": 30, "noiseScale" : 0.1, "warpScale" : 0.1, "floorVariants": [ diff --git a/assets/Data/game/recipes/voxelrecipes.json b/assets/Data/game/recipes/voxelrecipes.json index f7307766..3115c825 100644 --- a/assets/Data/game/recipes/voxelrecipes.json +++ b/assets/Data/game/recipes/voxelrecipes.json @@ -12,7 +12,7 @@ "products": [ { "itemType": "block:refined_wood", - "count": 1 + "count": 16 } ] }, @@ -28,8 +28,24 @@ "products": [ { "itemType": "block:brick_fant", + "count": 16 + } + ] + }, + { + "displayName": "Fantasy Brick", + "craftingTag" : "HAND", + "ingredients": [ + { + "itemType": "vox:rock_shale", "count": 1 } + ], + "products": [ + { + "itemType": "block:brick_fant", + "count": 16 + } ] } ], diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index b882ce51..050fdee4 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1674,6 +1674,7 @@ Small explore node height offset Terrain items Digging produces terrain item form Terrain items can be placed to place terrain +Recipe adjustment + voxel work diff --git a/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java b/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java index dfe47cb6..13f3c273 100644 --- a/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java +++ b/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java @@ -145,6 +145,9 @@ public class TerrainEditing { voxelPos.x >= 0 && voxelPos.y >= 0 && voxelPos.z >= 0 && + chunkPos.x >= 0 && + chunkPos.y >= 0 && + chunkPos.z >= 0 && currentPositionMagnitude > 0 && (data = voxelCellManager.getChunkAtPosition(chunkPos)) != null ){ diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java index 7d4c71b2..433b8ab5 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java @@ -88,7 +88,7 @@ public class NoiseVoxelGen implements VoxelGenerator { //below surface, ie generate stone here double finalSurface = sample; voxel.weight = (float)finalSurface; - voxel.type = 1; + voxel.type = 6; } else if(heightDiff > 0) { //above surface, ie generate air here voxel.weight = -1.0f;