Skip to content

Commit 0a9cd7a

Browse files
committed
UD-260306-layer3
1 parent 39a9cc0 commit 0a9cd7a

18 files changed

Lines changed: 93 additions & 34 deletions

File tree

src/generated/resources/data/mia/worldgen/density_function/great_fault/caves/big_cave.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"argument1": {
99
"type": "minecraft:y_clamped_gradient",
1010
"from_value": 1.5,
11-
"from_y": -384,
11+
"from_y": 384,
1212
"to_value": 0.1,
13-
"to_y": 0
13+
"to_y": 320
1414
},
1515
"argument2": {
1616
"type": "minecraft:add",
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"type": "minecraft:add",
3+
"argument1": {
4+
"type": "mia:abyss_hole",
5+
"mul": 0.6,
6+
"radius": 0.0,
7+
"slope": 16.0
8+
},
9+
"argument2": "mia:base_3d_noise_the_abyss"
10+
}

src/generated/resources/data/mia/worldgen/density_function/great_fault/great_fault_hole.json renamed to src/generated/resources/data/mia/worldgen/density_function/great_fault/great_fault_hole_below.json

File renamed without changes.

src/generated/resources/data/mia/worldgen/density_function/the_abyss/hole_above.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"argument1": {
44
"type": "mia:abyss_hole",
55
"mul": 1.0,
6-
"radius": 0.0
6+
"radius": 0.0,
7+
"slope": 64.0
78
},
89
"argument2": "mia:base_3d_noise_the_abyss"
910
}

src/generated/resources/data/mia/worldgen/noise_settings/great_fault.json

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,20 @@
6464
"type": "minecraft:add",
6565
"argument1": 1.025,
6666
"argument2": {
67-
"type": "minecraft:min",
68-
"argument1": "mia:great_fault/great_fault_hole",
69-
"argument2": {
70-
"type": "minecraft:add",
71-
"argument1": "minecraft:overworld/caves/spaghetti_2d",
72-
"argument2": "minecraft:overworld/caves/spaghetti_roughness_function"
73-
}
67+
"type": "minecraft:range_choice",
68+
"input": "minecraft:y",
69+
"max_exclusive": 320.0,
70+
"min_inclusive": -384.0,
71+
"when_in_range": {
72+
"type": "minecraft:min",
73+
"argument1": "mia:great_fault/great_fault_hole_below",
74+
"argument2": {
75+
"type": "minecraft:add",
76+
"argument1": "minecraft:overworld/caves/spaghetti_2d",
77+
"argument2": "minecraft:overworld/caves/spaghetti_roughness_function"
78+
}
79+
},
80+
"when_out_of_range": "mia:great_fault/great_fault_hole_above"
7481
}
7582
}
7683
}

src/generated/resources/data/mia/worldgen/noise_settings/the_abyss.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,8 @@
255255
"when_out_of_range": {
256256
"type": "mia:abyss_hole",
257257
"mul": 1.0,
258-
"radius": 0.0
258+
"radius": 0.0,
259+
"slope": 64.0
259260
}
260261
},
261262
"argument2": {

src/main/java/com/altnoir/mia/client/renderer/TheAbyssDimEffects.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.altnoir.mia.client.render.MiaRenderType;
44
import com.altnoir.mia.util.MiaUtil;
5-
import com.altnoir.mia.worldgen.MiaHeight;
5+
import com.altnoir.mia.core.MiaHeight;
66
import com.mojang.blaze3d.systems.RenderSystem;
77
import com.mojang.blaze3d.vertex.*;
88
import net.minecraft.client.Camera;

src/main/java/com/altnoir/mia/common/block/AbyssPortalBlock.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import com.altnoir.mia.MiaConfig;
44
import com.altnoir.mia.init.MiaSounds;
5-
import com.altnoir.mia.worldgen.MiaHeight;
5+
import com.altnoir.mia.core.MiaHeight;
66
import com.altnoir.mia.worldgen.dimension.MiaDimensions;
77
import com.mojang.serialization.MapCodec;
88
import net.minecraft.core.BlockPos;
9-
import net.minecraft.core.Direction;
109
import net.minecraft.core.particles.ParticleTypes;
1110
import net.minecraft.resources.ResourceKey;
1211
import net.minecraft.server.level.ServerLevel;

src/main/java/com/altnoir/mia/core/AbyssGravity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.altnoir.mia.core;
22

33
import com.altnoir.mia.compat.curios.CuriosTags;
4-
import com.altnoir.mia.worldgen.MiaHeight;
54
import com.altnoir.mia.worldgen.dimension.MiaDimensions;
65
import com.altnoir.mia.worldgen.noise_setting.densityfunction.HopperAbyssHole;
76
import net.minecraft.util.Mth;

src/main/java/com/altnoir/mia/worldgen/MiaHeight.java renamed to src/main/java/com/altnoir/mia/core/MiaHeight.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.altnoir.mia.worldgen;
1+
package com.altnoir.mia.core;
22

33
public record MiaHeight(int minY, int allY, int maxY) {
44
public static final MiaHeight THE_ABYSS = create(-256, 640);
@@ -13,6 +13,10 @@ public static MiaHeight create(int minY, int allY) {
1313
}
1414

1515
public int middleY() {
16-
return 5;
16+
if (this == THE_ABYSS) {
17+
return 5;
18+
} else {
19+
return (maxY - minY) / 2;
20+
}
1721
}
1822
}

0 commit comments

Comments
 (0)