Skip to content

Commit 91dab50

Browse files
RealAntEngineerRealAntEngineer
committed
added some rivers
Signed-off-by: Real Ant Engineer <[email protected]>
1 parent 5801c32 commit 91dab50

File tree

13 files changed

+262
-77
lines changed

13 files changed

+262
-77
lines changed

‎src/main/java/com/rae/creatingspace/CreatingSpace.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,4 @@ public static void onAddReloadListeners(AddReloadListenerEvent event)
121121
public static ResourceLocation resource(String path){
122122
return new ResourceLocation(MODID,path);
123123
}
124-
}
125-
124+
}

‎src/main/java/com/rae/creatingspace/content/recipes/electrolysis/MechanicalElectrolyserBlockRenderer.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
public class MechanicalElectrolyserBlockRenderer extends KineticBlockEntityRenderer<MechanicalElectrolyzerBlockEntity> {
2929

30+
static ModelPart ELECTRODES = createElectrodes();
31+
3032
public MechanicalElectrolyserBlockRenderer(BlockEntityRendererProvider.Context context) {
3133
super(context);
3234
}
@@ -48,6 +50,7 @@ protected void renderSafe(MechanicalElectrolyzerBlockEntity be, float partialTic
4850
ms.pushPose();
4951
ms.translate(0, -renderedHeadOffset, 0);
5052
renderElectrodesFromTexture(ms,
53+
//TODO better handling with the addition of namespace
5154
CreatingSpace.resource("textures/block/mechanical_electrolyzer/electrodes/" +
5255
electrode.getItemHolder().unwrapKey().orElseThrow().location().getPath() + ".png"), buffer);
5356
ms.popPose();
@@ -71,8 +74,7 @@ protected BlockState getRenderedBlockState(MechanicalElectrolyzerBlockEntity be)
7174
}
7275

7376
private void renderElectrodesFromTexture(PoseStack stack, ResourceLocation texLocation, MultiBufferSource buffer) {
74-
ModelPart electrodes = createElectrodes();
75-
electrodes.render(stack, buffer.getBuffer(RenderType.entitySolid(texLocation)), LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY);
77+
ELECTRODES.render(stack, buffer.getBuffer(RenderType.entitySolid(texLocation)), LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY);
7678
}
7779

7880
public static ModelPart createElectrodes() {

‎src/main/java/com/rae/creatingspace/content/recipes/electrolysis/MechanicalElectrolyzerBlockEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ protected Object getRecipeCacheKey() {
227227
protected boolean isRunning() {
228228
return running;
229229
}
230-
230+
//TODO custom advancement -> Create AdvancementInit
231231
@Override
232232
protected Optional<CreateAdvancement> getProcessedRecipeTrigger() {
233233
return Optional.of(AllAdvancements.MIXER);

‎src/main/resources/data/creatingspace/dimension/mars.json‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
}
116116
},
117117
{
118-
"biome": "creatingspace:mars/mossy_ravine",
118+
"biome": "creatingspace:mars/mossy_ravine_forest",
119119
"parameters": {
120120
"temperature": [
121121
-1,
@@ -135,6 +135,33 @@
135135
],
136136
"weirdness": [
137137
-1,
138+
-0.7
139+
],
140+
"depth": [-1,0.2],
141+
"offset": 0
142+
}
143+
},
144+
{
145+
"biome": "creatingspace:mars/mossy_ravine",
146+
"parameters": {
147+
"temperature": [
148+
-1,
149+
1
150+
],
151+
"humidity": [
152+
-1,
153+
1
154+
],
155+
"continentalness": [
156+
-1,
157+
0.3
158+
],
159+
"erosion": [
160+
-1,
161+
1
162+
],
163+
"weirdness": [
164+
-0.6,
138165
-0.4
139166
],
140167
"depth": [-1,0.2],
@@ -174,4 +201,4 @@
174201
]
175202
}
176203
}
177-
}
204+
}

‎src/main/resources/data/creatingspace/tags/entity_types/space_creatures.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
{"replace": false,
1+
{
2+
"replace": false,
23
"values": [
3-
"minecraft:skeleton"
4+
"minecraft:skeleton",
5+
"minecraft:zombie",
6+
"minecraft:slime"
47
]
58
}

‎src/main/resources/data/creatingspace/worldgen/biome/mars/dead_ravine.json‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/main/resources/data/creatingspace/worldgen/biome/mars/mossy_ravine.json‎

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"temperature": 1,
2+
"temperature": 2,
33
"downfall": 0.4,
44
"has_precipitation": false,
55
"temperature_modifier": "none",
@@ -9,35 +9,41 @@
99
"water_color": 4159204,
1010
"water_fog_color": 329011,
1111
"grass_color_modifier": "none",
12-
"music": {
13-
"sound": "creatingspace:music.mars.flumpidis",
14-
"min_delay": 2,
15-
"max_delay": 4,
16-
"replace_current_music": true
12+
"mood_sound": {
13+
},
14+
"particle": {
15+
}
16+
},
17+
"spawners": {
18+
"ambient": [
19+
],
20+
"axolotls": [],
21+
"creature": [],
22+
"misc": [],
23+
"monster": [
24+
{
25+
"type": "minecraft:slime",
26+
"weight": 100,
27+
"minCount": 1,
28+
"maxCount": 10
29+
}
30+
],
31+
"underground_water_creature": [],
32+
"water_ambient": [],
33+
"water_creature": []
34+
},
35+
"spawn_costs": {
36+
"minecraft:slime": {
37+
"energy_budget": 100,
38+
"charge": 1
1739
}
1840
},
19-
"spawners": {},
20-
"spawn_costs": {},
2141
"carvers": {
2242
"air": []
2343
},
2444
"features": [
25-
[],
26-
[],
2745
[
2846
"creatingspace:mars/crystal_geode"
29-
],
30-
[],
31-
[],
32-
[],
33-
[],
34-
[],
35-
[
36-
"creatingspace:mars/spring_water"
37-
],
38-
[
39-
"minecraft:patch_grass_jungle"
40-
],
41-
[]
47+
]
4248
]
43-
}
49+
}

‎src/main/resources/data/creatingspace/worldgen/biome/mars/mossy_ravine_forest.json‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
{
2+
"temperature": 1,
3+
"downfall": 0.4,
4+
"has_precipitation": false,
5+
"temperature_modifier": "none",
6+
"effects": {
7+
"sky_color": 13267456,
8+
"fog_color": 9788481,
9+
"water_color": 4159204,
10+
"water_fog_color": 329011,
11+
"grass_color_modifier": "none",
12+
"music": [
13+
{
14+
"data": {
15+
"sound": "creatingspace:music.mars.flumpidis",
16+
"min_delay": 2,
17+
"max_delay": 4,
18+
"replace_current_music": true
19+
},
20+
"weight": 10
21+
}
22+
]
23+
},
24+
"spawners": {
25+
"ambient": [
26+
],
27+
"axolotls": [],
28+
"creature": [],
29+
"misc": [],
30+
"monster": [
31+
{
32+
"type": "minecraft:zombie",
33+
"weight": 100,
34+
"minCount": 1,
35+
"maxCount": 10
36+
}
37+
],
38+
"underground_water_creature": [],
39+
"water_ambient": [],
40+
"water_creature": []
41+
},
42+
"spawn_costs": {
43+
"minecraft:zombie": {
44+
"energy_budget": 100,
45+
"charge": 1
46+
}
47+
},
48+
"carvers": {
49+
"air": []
50+
},
51+
"features": [
52+
[],
53+
[],
54+
[
55+
"creatingspace:mars/crystal_geode"
56+
],
57+
[],
58+
[],
59+
[],
60+
[],
61+
[],
62+
[
63+
"creatingspace:mars/spring_water"
64+
],
65+
[
66+
"minecraft:patch_grass_jungle",
67+
"minecraft:trees_jungle"
68+
],
69+
[]
70+
]
71+
}

‎src/main/resources/data/creatingspace/worldgen/configured_feature/mars/crystal_geode.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
"middle_layer_provider": {
2424
"type": "minecraft:simple_state_provider",
2525
"state": {
26-
"Name": "minecraft:calcite"
26+
"Name": "create:veridium"
2727
}
2828
},
2929
"outer_layer_provider": {
3030
"type": "minecraft:simple_state_provider",
3131
"state": {
32-
"Name": "minecraft:smooth_basalt"
32+
"Name": "create:crimsite"
3333
}
3434
},
3535
"inner_placements": [

‎src/main/resources/data/creatingspace/worldgen/density_function/mars/depth.json‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,21 @@
1111
"type": "minecraft:add",
1212
"argument1": "creatingspace:mars/offset",
1313
"argument2": {
14-
"type": "minecraft:mul",
15-
"argument1": "creatingspace:mars/ravines_folded",
16-
"argument2": "creatingspace:mars/ravine_factor"
14+
"type": "minecraft:add",
15+
"argument1": {
16+
"type": "minecraft:mul",
17+
"argument1": "creatingspace:mars/ravines_folded",
18+
"argument2": "creatingspace:mars/ravine_factor"
19+
},
20+
"argument2": {
21+
"type": "minecraft:mul",
22+
"argument1":"creatingspace:mars/ravines_rivers_folded",
23+
"argument2": {
24+
"type": "minecraft:mul",
25+
"argument1": 0.6,
26+
"argument2": "creatingspace:mars/ravine_factor"
27+
}
28+
}
1729
}
1830
}
1931
}

0 commit comments

Comments
 (0)