Skip to content

Commit

Permalink
new venus block textures and revamped 1 venus biome
Browse files Browse the repository at this point in the history
  • Loading branch information
@zVoltaic
zVoltaic committed Feb 9, 2024
1 parent 8e46595 commit 96be001
Show file tree
Hide file tree
Showing 8 changed files with 113 additions and 60 deletions.
2 changes: 1 addition & 1 deletion settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencyResolutionManagement {
def vineFlowerVersion = "1.+"
def macheteVersion = "1.+"
def configurationVersion = "2.2.0"
def gtCeuVersion = "1.1.2.a"
def gtCeuVersion = "1.1.3"
def ldLibVersion = "1.0.23.a"
def mixinExtrasVersion = "0.2.0"
def mixinVersion = "0.8.6-SNAPSHOT"
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/argent_matter/gcyr/common/data/GCyRBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import static argent_matter.gcyr.api.registries.GCyRRegistries.REGISTRATE;

@SuppressWarnings("unused")
public class GCyRBlocks {
public class GCyRBlocks {

static {
REGISTRATE.creativeModeTab(() -> GCyRCreativeModeTabs.GCYR);
Expand Down Expand Up @@ -72,15 +72,15 @@ public class GCyRBlocks {
public static final BlockEntry<Block> VENUSIAN_REGOLITH = REGISTRATE
.block("venusian_regolith", Block::new)
.initialProperties(() -> Blocks.SANDSTONE)
.properties(properties -> properties.mapColor(MapColor.TERRACOTTA_ORANGE))
.properties(properties -> properties.mapColor(MapColor.TERRACOTTA_GRAY))
.blockstate(GCyRModels::randomRotatedModel)
.simpleItem()
.register();

public static final BlockEntry<Block> VENUS_ROCK = REGISTRATE
.block("venus_rock", Block::new)
.initialProperties(() -> Blocks.STONE)
.properties(properties -> properties.mapColor(MapColor.TERRACOTTA_ORANGE))
.properties(properties -> properties.mapColor(MapColor.TERRACOTTA_LIGHT_GRAY))
.blockstate(GCyRModels::randomRotatedModel)
.simpleItem()
.register();
Expand Down
Binary file modified src/main/resources/assets/gcyr/textures/block/venus_rock.png
View file
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 src/main/resources/assets/gcyr/textures/block/venus_sand.png
View file
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 src/main/resources/assets/gcyr/textures/block/venusian_regolith.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/main/resources/data/gcyr/worldgen/noise/surface_alt_1.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"firstOctave": -5,
"amplitudes": [
1,
1.5,
0.25,
1
]
}
9 changes: 9 additions & 0 deletions src/main/resources/data/gcyr/worldgen/noise/surface_alt_2.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"firstOctave": -8,
"amplitudes": [
1,
1,
1,
1
]
}
147 changes: 91 additions & 56 deletions src/main/resources/data/gcyr/worldgen/noise_settings/venus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:basalt",
"Name": "gcyr:venusian_regolith",
"Properties": {
"axis": "y"
}
Expand All @@ -388,80 +388,115 @@
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:stone_depth",
"offset": 0,
"surface_type": "floor",
"add_surface_depth": true,
"secondary_depth_range": 0
"type": "minecraft:above_preliminary_surface"
},
"then_run": {
"type": "minecraft:sequence",
"sequence": [
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "minecraft:patch",
"min_threshold": -0.012,
"max_threshold": 1.7976931348623157e+308
},
"then_run": {
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:stone_depth",
"offset": 0,
"surface_type": "floor",
"add_surface_depth": true,
"secondary_depth_range": 0
},
"then_run": {
"type": "minecraft:sequence",
"sequence": [
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:y_above",
"anchor": {
"absolute": 30
},
"surface_depth_multiplier": 0,
"add_stone_depth": true
"type": "minecraft:noise_threshold",
"noise": "gcyr:surface_alt_1",
"min_threshold": -0.0125,
"max_threshold": 1E308
},
"then_run": {
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:not",
"invert": {
"type": "minecraft:y_above",
"anchor": {
"absolute": 35
},
"surface_depth_multiplier": 0,
"add_stone_depth": true
}
"type": "minecraft:y_above",
"anchor": {
"absolute": 30
},
"surface_depth_multiplier": 0,
"add_stone_depth": true
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:gravel"
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:not",
"invert": {
"type": "minecraft:y_above",
"anchor": {
"absolute": 35
},
"surface_depth_multiplier": 0,
"add_stone_depth": true
}
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:gravel"
}
}
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:stone_depth",
"surface_type": "floor",
"add_surface_depth": true ,
"secondary_depth_range": 0,
"offset": 0
},
"then_run":
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "gcyr:surface_alt_1",
"min_threshold": 0.225,
"max_threshold": 1E308
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "gcyr:venus_sand",
"Properties": {
"axis": "y"
}
}
}
}
},
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "minecraft:nether_state_selector",
"min_threshold": 0,
"max_threshold": 1.7976931348623157e+308
},
"then_run": {
{
"type": "minecraft:condition",
"if_true": {
"type": "minecraft:noise_threshold",
"noise": "gcyr:surface_alt_1",
"min_threshold": -0.1,
"max_threshold": 0.225
},
"then_run": {
"type": "minecraft:block",
"result_state": {
"Name": "gcyr:venus_rock",
"Properties": {
"axis": "y"
}
}
}
},
{
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:basalt",
"Properties": {
"axis": "y"
}
"Name": "gcyr:venusian_regolith"
}
}
},
{
"type": "minecraft:block",
"result_state": {
"Name": "minecraft:blackstone"
}
}
]
]
}
}
}
]
Expand Down

0 comments on commit 96be001

Please sign in to comment.