Skip to content

Commit

Permalink
Added Mars + Start on Solar System Planets
Browse files Browse the repository at this point in the history
  • Loading branch information
NemEzanevem committed Dec 5, 2023
1 parent d226be6 commit ca2f6ad
Show file tree
Hide file tree
Showing 24 changed files with 719 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import com.gregtechceu.gtceu.utils.FormattingUtil;
import com.lowdragmc.lowdraglib.Platform;
import com.lowdragmc.lowdraglib.client.renderer.IRenderer;
import com.tterrag.registrate.Registrate;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.nullness.NonNullBiConsumer;
import com.tterrag.registrate.util.nullness.NonNullSupplier;
Expand Down Expand Up @@ -59,8 +60,22 @@ public class GCyRBlocks {
.register();

public static final BlockEntry<FallingBlock> MOON_SAND = REGISTRATE

.block("moon_sand", FallingBlock::new)
.initialProperties(() -> Blocks.GRAVEL)
.initialProperties(() -> Blocks.SAND)
.simpleItem()
.register();

// region mars
public static final BlockEntry<Block> MARS_REGOLITH = REGISTRATE
.block("mars_regolith", Block::new)
.initialProperties(() -> Blocks.SAND)
.simpleItem()
.register();

public static final BlockEntry<Block> MARTIAN_ROCK = REGISTRATE
.block("martian_rock", Block::new)
.initialProperties(() -> Blocks.STONE)
.simpleItem()
.register();

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"galaxy": "gcyr:milky_way",
"solar_system": "gcyr:solar_system",
"texture": "gcyr:textures/sky/mars.png",
"speed": 687,
"scale": 10,
"radius": 4.0
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified common/src/main/resources/assets/gcyr/textures/block/moon_stone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions common/src/main/resources/data/gcyr/dimension/mars.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"type": "gcyr:mars",
"generator": {
"type": "minecraft:noise",
"settings": "gcyr:mars",
"biome_source": {
"type": "minecraft:multi_noise",
"biomes": [
{
"biome": "gcyr:martian_wastelands",
"parameters": {
"temperature": -0.5,
"humidity": 0,
"continentalness": 0,
"erosion": 0,
"weirdness": 0,
"depth": 0,
"offset": 0.175
}
},
{
"biome": "gcyr:martian_canyon_creek",
"parameters": {
"temperature": -0.5,
"humidity": 0,
"continentalness": 0,
"erosion": 0,
"weirdness": -0.25,
"depth": 0,
"offset": 0
}
},
{
"biome": "gcyr:martian_polar_caps",
"parameters": {
"temperature": -0.5,
"humidity": 0,
"continentalness": 0,
"erosion": 0,
"weirdness": -0.5,
"depth": 0,
"offset": 0
}
}
]
}
}
}
6 changes: 6 additions & 0 deletions common/src/main/resources/data/gcyr/dimension/mars_orbit.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "gcyr:space",
"generator": {
"type": "gcyr:space"
}
}
24 changes: 24 additions & 0 deletions common/src/main/resources/data/gcyr/dimension_type/mars.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"ultrawarm": false,
"natural": true,
"piglin_safe": false,
"respawn_anchor_works": false,
"bed_works": true,
"has_raids": false,
"has_skylight": true,
"has_ceiling": false,
"coordinate_scale": 1,
"ambient_light": 0,
"logical_height": 384,
"infiniburn": "#minecraft:infiniburn_overworld",
"min_y": -64,
"height": 384,
"monster_spawn_block_light_limit": 0,
"monster_spawn_light_level": {
"type": "minecraft:uniform",
"value": {
"min_inclusive": 0,
"max_inclusive": 7
}
}
}
16 changes: 16 additions & 0 deletions common/src/main/resources/data/gcyr/gcyr/planets/mars.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"translation": "level.gcyr.mars",
"galaxy": "gcyr:milky_way",
"solar_system": "gcyr:solar_system",
"world": "gcyr:mars",
"orbit_world": "gcyr:mars_orbit",
"rocket_tier": 2,
"gravity": 3.72076,
"has_atmosphere": true,
"days_in_year": 687,
"temperature": -65,
"solar_power": 11,
"orbit_solar_power": 13,
"has_oxygen": false,
"button_color": 4289243304
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"temperature": 0.8,
"downfall": 0,
"has_precipitation": false,
"effects": {
"sky_color": 15117444,
"fog_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011,
"grass_color": 9551193,
"foliage_color": 7842607
},
"creature_spawn_probability": 0.2,
"spawners": {
},
"spawn_costs": {
},
"carvers": {
"air": [
"minecraft:cave",
"minecraft:cave_extra_underground",
"minecraft:canyon"
]
},
"features": [
[
"minecraft:large_dripstone",
"minecraft:dripstone_cluster",
"minecraft:pointed_dripstone"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"temperature": -0.7,
"downfall": 1,
"has_precipitation": true,
"effects": {
"sky_color": 15117444,
"fog_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011,
"grass_color": 9551193,
"foliage_color": 7842607
},
"creature_spawn_probability": 0.2,
"spawners": {
},
"spawn_costs": {
},
"carvers": {
"air": [
"minecraft:cave",
"minecraft:cave_extra_underground",
"minecraft:canyon"
]
},
"features": [
[
"minecraft:large_dripstone",
"minecraft:dripstone_cluster",
"minecraft:pointed_dripstone"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"temperature": 0.8,
"downfall": 0,
"has_precipitation": false,
"effects": {
"sky_color": 15117444,
"fog_color": 15117444,
"water_color": 4159204,
"water_fog_color": 329011,
"grass_color": 9551193,
"foliage_color": 7842607
},
"creature_spawn_probability": 0.2,
"spawners": {
},
"spawn_costs": {
},
"carvers": {
"air": [
"minecraft:cave",
"minecraft:cave_extra_underground",
"minecraft:canyon"
]
},
"features": [
[
"minecraft:large_dripstone",
"minecraft:dripstone_cluster",
"minecraft:pointed_dripstone"
]
]
}
Loading

0 comments on commit ca2f6ad

Please sign in to comment.