Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
shedaniel committed Jul 23, 2020
2 parents ee85188 + 243f0a9 commit d410a0f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.source.BiomeSource;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.gen.ChunkRandom;
import net.minecraft.world.gen.StructureAccessor;
import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.chunk.StructuresConfig;
Expand Down Expand Up @@ -93,6 +94,8 @@ public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk c

int x2 = chunk.getPos().getEndX();
int z2 = chunk.getPos().getEndZ();
ChunkRandom chunkRandom = new ChunkRandom();
chunkRandom.setTerrainSeed(chunk.getPos().x, chunk.getPos().z);

for (int x = x1; x <= x2; ++x) {
for (int z = z1; z <= z2; ++z) {
Expand Down Expand Up @@ -125,6 +128,12 @@ public void populateNoise(WorldAccess world, StructureAccessor accessor, Chunk c
int height = (int) (depth + (noise * scale));
for (int y = 0; y <= height; ++y) {
chunk.setBlockState(new BlockPos(x, y, z), AstromineBlocks.MOON_STONE.getDefaultState(), false);
if (y <= 5) {
if (chunkRandom.nextInt(y + 1) == 0) {
chunk.setBlockState(new BlockPos(x, y, z), Blocks.BEDROCK.getDefaultState(), false);
}
}

}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "astromine:triturating",
"input": {
"tag": "c:quartz_ores",
"count": 1
},
"output": {
"item": "astromine:quartz_dust",
"count": 2
},
"time": 30,
"energy_consumed": 280
}
6 changes: 6 additions & 0 deletions src/main/resources/data/c/tags/items/quartz_ores.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:nether_quartz_ore"
]
}

0 comments on commit d410a0f

Please sign in to comment.