Skip to content

Commit 0eb7b82

Browse files
AltnoirAltnoir
committed
UD-260112
1 parent ca0642a commit 0eb7b82

14 files changed

Lines changed: 575 additions & 100 deletions

File tree

‎src/generated/resources/data/mia/dimension/the_abyss.json‎

Lines changed: 33 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,17 @@
2828
"biome": "mia:the_abyss/skyfog_forest",
2929
"parameters": {
3030
"continentalness": 0.0,
31-
"depth": [
32-
0.0,
33-
0.8
34-
],
31+
"depth": 0.0,
3532
"erosion": 0.0,
3633
"humidity": [
37-
-0.5,
38-
0.0
34+
-0.8,
35+
0.2
3936
],
4037
"offset": 0.0,
4138
"temperature": 0.8,
4239
"weirdness": [
43-
0.3,
44-
0.5
40+
-0.5,
41+
-0.3
4542
]
4643
}
4744
},
@@ -61,7 +58,7 @@
6158
}
6259
},
6360
{
64-
"biome": "mia:the_abyss/abyss_plains",
61+
"biome": "mia:the_abyss/skyfog_forest",
6562
"parameters": {
6663
"continentalness": 0.0,
6764
"depth": [
@@ -70,55 +67,28 @@
7067
],
7168
"erosion": 0.0,
7269
"humidity": [
73-
0.0,
74-
0.5
75-
],
76-
"offset": 0.0,
77-
"temperature": 0.8,
78-
"weirdness": 0.0
79-
}
80-
},
81-
{
82-
"biome": "mia:the_abyss/skyfog_forest",
83-
"parameters": {
84-
"continentalness": 0.0,
85-
"depth": 0.0,
86-
"erosion": 0.0,
87-
"humidity": [
88-
-0.8,
89-
0.2
70+
-0.5,
71+
0.0
9072
],
9173
"offset": 0.0,
9274
"temperature": 0.8,
9375
"weirdness": [
94-
-0.5,
95-
-0.3
76+
0.3,
77+
0.5
9678
]
9779
}
9880
},
9981
{
10082
"biome": "mia:the_abyss/abyss_plains",
10183
"parameters": {
10284
"continentalness": 0.0,
103-
"depth": 2.0,
104-
"erosion": 0.0,
105-
"humidity": [
85+
"depth": [
10686
0.0,
107-
0.5
87+
0.8
10888
],
109-
"offset": 0.0,
110-
"temperature": 0.8,
111-
"weirdness": 0.0
112-
}
113-
},
114-
{
115-
"biome": "mia:the_abyss/skyfog_forest",
116-
"parameters": {
117-
"continentalness": 0.0,
118-
"depth": 2.0,
11989
"erosion": 0.0,
12090
"humidity": [
121-
-0.5,
91+
0.0,
12292
0.5
12393
],
12494
"offset": 0.0,
@@ -132,7 +102,7 @@
132102
"continentalness": 0.0,
133103
"depth": [
134104
0.1,
135-
0.6
105+
0.4
136106
],
137107
"erosion": 0.0,
138108
"humidity": [
@@ -149,8 +119,8 @@
149119
"parameters": {
150120
"continentalness": 0.0,
151121
"depth": [
152-
0.6,
153-
1.1
122+
0.4,
123+
0.7
154124
],
155125
"erosion": 0.0,
156126
"humidity": [
@@ -167,8 +137,8 @@
167137
"parameters": {
168138
"continentalness": 0.0,
169139
"depth": [
170-
1.1,
171-
1.6
140+
0.7,
141+
1.0
172142
],
173143
"erosion": 0.0,
174144
"humidity": [
@@ -179,6 +149,21 @@
179149
"temperature": 0.8,
180150
"weirdness": 0.0
181151
}
152+
},
153+
{
154+
"biome": "mia:the_abyss/temptation_forest",
155+
"parameters": {
156+
"continentalness": 0.0,
157+
"depth": 2.0,
158+
"erosion": 0.0,
159+
"humidity": [
160+
-0.5,
161+
0.5
162+
],
163+
"offset": 0.0,
164+
"temperature": 0.8,
165+
"weirdness": 0.0
166+
}
182167
}
183168
]
184169
},

‎src/generated/resources/data/mia/worldgen/biome/the_abyss/temptation_forest.json‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
{
2+
"carvers": {},
3+
"downfall": 0.8,
4+
"effects": {
5+
"additions_sound": {
6+
"sound": "minecraft:ambient.basalt_deltas.additions",
7+
"tick_chance": 0.0111
8+
},
9+
"ambient_sound": "minecraft:ambient.basalt_deltas.loop",
10+
"fog_color": 8888490,
11+
"grass_color": 11335504,
12+
"mood_sound": {
13+
"block_search_extent": 8,
14+
"offset": 2.0,
15+
"sound": "minecraft:ambient.cave",
16+
"tick_delay": 6000
17+
},
18+
"music": {
19+
"max_delay": 24000,
20+
"min_delay": 12000,
21+
"replace_current_music": false,
22+
"sound": "mia:music.the_abyss.dim"
23+
},
24+
"sky_color": 8888490,
25+
"water_color": 6141935,
26+
"water_fog_color": 6141935
27+
},
28+
"features": [
29+
[],
30+
[],
31+
[
32+
"mia:the_abyss/prasiolite_geode",
33+
"mia:the_abyss/raw_iron"
34+
],
35+
[
36+
"mia:the_abyss/monster_cheat",
37+
"mia:the_abyss/slab_ruins",
38+
"mia:the_abyss/sun_stone"
39+
],
40+
[],
41+
[],
42+
[
43+
"minecraft:ore_dirt",
44+
"minecraft:ore_gravel",
45+
"minecraft:ore_granite_upper",
46+
"minecraft:ore_granite_lower",
47+
"minecraft:ore_diorite_upper",
48+
"minecraft:ore_diorite_lower",
49+
"minecraft:ore_tuff",
50+
"minecraft:ore_iron_upper",
51+
"minecraft:ore_iron_middle",
52+
"minecraft:ore_iron_small",
53+
"minecraft:ore_gold",
54+
"minecraft:ore_gold_lower",
55+
"minecraft:ore_redstone",
56+
"minecraft:ore_redstone_lower",
57+
"minecraft:ore_diamond",
58+
"minecraft:ore_diamond_medium",
59+
"minecraft:ore_diamond_large",
60+
"minecraft:ore_diamond_buried",
61+
"minecraft:ore_lapis",
62+
"minecraft:ore_lapis_buried",
63+
"minecraft:ore_copper_large",
64+
"minecraft:underwater_magma",
65+
"minecraft:disk_sand",
66+
"minecraft:disk_clay",
67+
"minecraft:disk_gravel"
68+
],
69+
[],
70+
[
71+
"mia:the_abyss/spring_water"
72+
],
73+
[
74+
"mia:the_abyss/vines",
75+
"mia:the_abyss/glow_lichen",
76+
"mia:the_abyss/patch_grass_plain",
77+
"mia:the_abyss/flower_meadow",
78+
"mia:the_abyss/forest_flowers",
79+
"mia:the_abyss/trees_skyfog_and_azalea",
80+
"mia:the_abyss/patch_large_fern",
81+
"mia:the_abyss/cave_vines",
82+
"minecraft:brown_mushroom_normal",
83+
"minecraft:red_mushroom_normal",
84+
"minecraft:patch_sugar_cane",
85+
"minecraft:patch_pumpkin"
86+
]
87+
],
88+
"has_precipitation": true,
89+
"spawn_costs": {},
90+
"spawners": {
91+
"ambient": [],
92+
"axolotls": [],
93+
"creature": [
94+
{
95+
"type": "minecraft:sheep",
96+
"maxCount": 4,
97+
"minCount": 4,
98+
"weight": 12
99+
},
100+
{
101+
"type": "minecraft:pig",
102+
"maxCount": 4,
103+
"minCount": 4,
104+
"weight": 10
105+
},
106+
{
107+
"type": "minecraft:chicken",
108+
"maxCount": 4,
109+
"minCount": 4,
110+
"weight": 10
111+
},
112+
{
113+
"type": "minecraft:cow",
114+
"maxCount": 4,
115+
"minCount": 4,
116+
"weight": 8
117+
}
118+
],
119+
"misc": [],
120+
"monster": [
121+
{
122+
"type": "minecraft:slime",
123+
"maxCount": 4,
124+
"minCount": 4,
125+
"weight": 10
126+
}
127+
],
128+
"underground_water_creature": [
129+
{
130+
"type": "minecraft:glow_squid",
131+
"maxCount": 6,
132+
"minCount": 4,
133+
"weight": 10
134+
}
135+
],
136+
"water_ambient": [
137+
{
138+
"type": "minecraft:tropical_fish",
139+
"maxCount": 8,
140+
"minCount": 8,
141+
"weight": 25
142+
},
143+
{
144+
"type": "minecraft:cod",
145+
"maxCount": 6,
146+
"minCount": 3,
147+
"weight": 25
148+
}
149+
],
150+
"water_creature": []
151+
},
152+
"temperature": 0.8
153+
}

‎src/generated/resources/data/mia/worldgen/density_function/the_abyss/caves/depth.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"type": "minecraft:add",
99
"argument1": {
1010
"type": "minecraft:y_clamped_gradient",
11-
"from_value": 2.5,
12-
"from_y": 0,
13-
"to_value": -1.5,
14-
"to_y": 512
11+
"from_value": 1.5,
12+
"from_y": 5,
13+
"to_value": -2.5,
14+
"to_y": 1200
1515
},
1616
"argument2": "minecraft:overworld/offset"
1717
}

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

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,7 @@
358358
"mia:the_abyss/skyfog_forest",
359359
"mia:the_abyss/abyss_plains",
360360
"mia:the_abyss/prasiolite_caves",
361-
"mia:the_abyss/abyss_lush_caves",
362-
"minecraft:cherry_grove"
361+
"mia:the_abyss/abyss_lush_caves"
363362
]
364363
},
365364
"then_run": {
@@ -437,6 +436,45 @@
437436
}
438437
]
439438
}
439+
},
440+
{
441+
"type": "minecraft:condition",
442+
"if_true": {
443+
"type": "minecraft:biome",
444+
"biome_is": [
445+
"mia:the_abyss/temptation_forest"
446+
]
447+
},
448+
"then_run": {
449+
"type": "minecraft:sequence",
450+
"sequence": [
451+
{
452+
"type": "minecraft:condition",
453+
"if_true": {
454+
"type": "minecraft:stone_depth",
455+
"add_surface_depth": true,
456+
"offset": 0,
457+
"secondary_depth_range": 1,
458+
"surface_type": "floor"
459+
},
460+
"then_run": {
461+
"type": "minecraft:condition",
462+
"if_true": {
463+
"type": "minecraft:water",
464+
"add_stone_depth": false,
465+
"offset": 0,
466+
"surface_depth_multiplier": 0
467+
},
468+
"then_run": {
469+
"type": "minecraft:block",
470+
"result_state": {
471+
"Name": "minecraft:mud"
472+
}
473+
}
474+
}
475+
}
476+
]
477+
}
440478
}
441479
]
442480
}

‎src/main/java/com/altnoir/mia/block/AmethystTubeBlock.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,7 @@ private boolean propagateSignal(Level level, BlockPos pos, BlockState state, Blo
151151
}
152152

153153
private Optional<RecipeHolder<LampTubeRecipe>> getCurrentRecipe(Level level, ItemStack stack) {
154-
return level.getRecipeManager()
155-
.getRecipeFor(MiaRecipes.LAMP_TUBE_TYPE.get(), new LampTubeRecipeInput(stack), level);
154+
return level.getRecipeManager().getRecipeFor(MiaRecipes.LAMP_TUBE_TYPE.get(), new LampTubeRecipeInput(stack), level);
156155
}
157156

158157
private void recipeShrinkEffect(Container container, Level level, ItemStack stack, BlockPos targetPos, BlockPos pos, BlockState state, int count) {

‎src/main/java/com/altnoir/mia/block/ArtifactSmithingTableBlock.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ public ArtifactSmithingTableBlock(Properties properties) {
3232
@Override
3333
protected MenuProvider getMenuProvider(BlockState state, Level level, BlockPos pos) {
3434
return new SimpleMenuProvider((containerId, playerInventory, player) ->
35-
new ArtifactSmithingTableMenu(containerId, playerInventory,
36-
ContainerLevelAccess.create(level, pos)), CONTAINER_TITLE);
35+
new ArtifactSmithingTableMenu(containerId, playerInventory, ContainerLevelAccess.create(level, pos)), CONTAINER_TITLE);
3736
}
3837

3938
@Override

0 commit comments

Comments
 (0)