Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ repositories {
maven {
name = 'GeckoLib'
url = 'https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/'
content {
includeGroup("software.bernie.geckolib")
}
}
}
filter {
Expand Down
20 changes: 10 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
mod_name=Dynamic Trees BWG
mod_id=dtbwg
mod_version=1.1.0-BETA02
mod_version=1.1.0-BETA03
mod_group_id=maxhyper.dtbwg
mod_license=MIT
mod_credits=GroupiX05, metafive
Expand All @@ -19,19 +19,19 @@ neo_version=21.1.208
loader_version_range=[1,)

# Dynamic Trees
dynamic_trees_version=1.5.0-BETA13
dynamic_trees_plus_version=1.3.0-BETA03
dynamic_trees_version=1.7.2
dynamic_trees_plus_version=1.3.2

# Utilities
jade_version=15.10.3
jei_version=19.25.0.325
cc_version=1.116.2
jade_version=15.10.5
jei_version=19.39.0.371
cc_version=1.120.0

# Addon
bwg_version=2.5.0
ohthetreesyoullgrow_version=5.1.2
geckolib_version=4.7.7
corgilib_version=5.0.0.7
bwg_version=2.6.0
ohthetreesyoullgrow_version=5.3.2
geckolib_version=4.9.2
corgilib_version=5.0.0.9
terrablender_version=4.1.0.8

versionType=beta
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ protected String getCenterBlockRegistryNameSuffix() {
}

@Override
public BlockBehaviour.Properties getDefaultBlockProperties(MapColor mapColor) {
public BlockBehaviour.Properties getDefaultBlockProperties() {
return BlockBehaviour.Properties.ofFullCopy(Blocks.CLAY).mapColor(MapColor.TERRACOTTA_YELLOW).sound(SoundType.HONEY_BLOCK).noOcclusion().speedFactor(1.3f);
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/maxhyper/dtbwg/blocks/WartyCapProperties.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ public void setShroomlightRequireSupport(boolean shroomlightRequireSupport) {
}

@Override
public BlockBehaviour.Properties getDefaultBlockProperties(final MapColor mapColor) {
public BlockBehaviour.Properties getDefaultBlockProperties() {
return BlockBehaviour.Properties.of()
.mapColor(mapColor.GRASS)
.mapColor(MapColor.GRASS)
.strength(1.0F)
.sound(SoundType.WART_BLOCK);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/trees/dtbwg/families/palm.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "dtbwg:diagonal_palm",
"type": "palm",
"common_leaves": "dtbwg:palm",
"common_species": "dtbwg:palm",
"primitive_log": "biomeswevegone:palm_log",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "palm",
"primitive_leaves": "biomeswevegone:palm_leaves",
"cell_kit": "dtbwg:palm",
"cell_kit": "dynamictrees:palm",
"color": "#BBFF59",
"model_overrides": {
"leaves": "biomeswevegone:block/palm_leaves"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/trees/dtbwg/leaves_properties/palm.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type": "palm",
"primitive_leaves": "biomeswevegone:palm_leaves",
"cell_kit": "dtbwg:palm",
"cell_kit": "dynamictrees:palm",
"color": "#BBFF59",
"model_overrides": {
"leaves": "biomeswevegone:block/palm_leaves"
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/ancient_birch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@
"max_branch_radius": 24,
"leaves_properties": "birch",
"growth_logic_kit": "dtbwg:ancient",
"environment_factors": {
"cold": 0.9,
"hot": 0.9,
"dry": 0.8,
"magical": 1.1
},
"preferred_climate": "temperate",
"climate_tolerance": 0.5,
"perfect_biomes": {
"name": "biomeswevegone:overgrowth_woodlands"
},
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/ancient_dark_oak.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@
"max_branch_radius": 24,
"leaves_properties": "dark_oak",
"growth_logic_kit": "dtbwg:ancient",
"environment_factors": {
"cold": 0.9,
"hot": 0.9,
"dry": 0.8,
"magical": 1.1
},
"preferred_climate": "temperate",
"climate_tolerance": 0.6,
"perfect_biomes": {
"name": "biomeswevegone:forgotten_forest"
},
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/ancient_ebony.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@
"max_branch_radius": 24,
"leaves_properties": "dtbwg:ancient_ebony",
"growth_logic_kit": "dtbwg:ancient",
"environment_factors": {
"cold": 0.9,
"hot": 0.9,
"dry": 0.8,
"magical": 1.1
},
"preferred_climate": "temperate",
"climate_tolerance": 0.6,
"perfect_biomes": {
"name": "biomeswevegone:forgotten_forest"
},
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/ancient_oak.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@
"max_branch_radius": 24,
"leaves_properties": "dtbwg:ancient_oak",
"growth_logic_kit": "dtbwg:ancient",
"environment_factors": {
"cold": 0.9,
"hot": 0.9,
"dry": 0.8,
"magical": 1.1
},
"preferred_climate": "temperate",
"climate_tolerance": 0.5,
"perfect_biomes": {
"name": "biomeswevegone:forgotten_forest"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@
"leaves_properties": "dtbwg:ancient_silver_maple",
"growth_logic_kit": "dtbwg:ancient",
"seed": "dtbwg:silver_maple_seed",
"environment_factors": {
"cold": 0.9,
"hot": 0.9,
"dry": 0.8,
"magical": 1.1
},
"preferred_climate": "temperate",
"climate_tolerance": 0.5,
"perfect_biomes": {
"name": "biomeswevegone:forgotten_forest"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@
"leaves_properties": "dtbwg:yellow_birch",
"seed": "dtbwg:yellow_birch_seed",
"growth_logic_kit": "dtbwg:ancient",
"environment_factors": {
"cold": 0.9,
"hot": 0.9,
"dry": 0.8,
"magical": 1.1
},
"preferred_climate": "temperate",
"climate_tolerance": 0.5,
"perfect_biomes": {
"name": "biomeswevegone:overgrowth_woodlands"
},
Expand Down
6 changes: 2 additions & 4 deletions src/main/resources/trees/dtbwg/species/araucaria.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@
"generate_sapling": true,
"growth_logic_kit": "dtbwg:araucaria",
"leaves_properties": "dtbwg:araucaria",
"environment_factors": {
"wet": 0.75,
"cold": 0.50
},
"preferred_climate": "arid",
"climate_tolerance": 0.3,
"common_override": {
"name": "biomeswevegone:.*araucaria.*"
},
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/aspen.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@
"growth_rate": 0.8,
"leaves_properties": "dtbwg:aspen",
"growth_logic_kit": "dtbwg:aspen",
"environment_factors": {
"cold": 1.1,
"hot": 0.2,
"dry": 0.4,
"forest": 0.9
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"perfect_biomes": {
"name": "biomeswevegone:aspen.*"
},
Expand Down
6 changes: 2 additions & 4 deletions src/main/resources/trees/dtbwg/species/baobab.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
"soil_longevity": 20,
"max_branch_radius": 24,
"leaves_properties": "dtbwg:baobab",
"environment_factors": {
"cold": 0.75,
"forest": 0.9
},
"preferred_climate": "arid",
"climate_tolerance": 0.5,
"perfect_biomes": {
"name": "biomeswevegone:.*baobab.*"
},
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/trees/dtbwg/species/blue_spruce.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@
"leaves_properties": "dtbwg:blue_spruce",
"generate_seed": true,
"generate_sapling": true,
"environment_factors": {
"hot": 0.50,
"dry": 0.25,
"wet": 0.75
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"perfect_biomes": {
"name": "biomeswevegone:frosted_taiga.*"
},
Expand Down
6 changes: 2 additions & 4 deletions src/main/resources/trees/dtbwg/species/brown_zelkova.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@
"leaves_properties": "dtbwg:brown_zelkova",
"generate_seed": true,
"generate_sapling": true,
"environment_factors": {
"hot": 0.50,
"wet": 0.75
},
"preferred_climate": "cold",
"climate_tolerance": 0.4,
"perfect_biomes": {
"name": ".*zelkova.*"
},
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/canopy_aspen.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
"soil_longevity": 2,
"leaves_properties": "dtbwg:aspen",
"growth_logic_kit": "dtbwg:aspen",
"environment_factors": {
"cold": 1.1,
"hot": 0.2,
"dry": 0.4,
"forest": 0.9
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"always_show_on_waila": false,
"perfect_biomes": {
"name": "biomeswevegone:aspen.*"
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/canopy_dark_oak.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
"growth_rate": 0.8,
"leaves_properties": "dtbwg:canopy_dark_oak",
"growth_logic_kit": "dtbwg:maple",
"environment_factors": {
"cold": 1.1,
"hot": 0.2,
"dry": 0.4,
"forest": 0.9
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"perfect_biomes": {
"name": ".*meadow.*"
},
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/trees/dtbwg/species/canopy_oak.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
"growth_rate": 0.8,
"leaves_properties": "dtbwg:canopy_oak",
"growth_logic_kit": "dtbwg:maple",
"environment_factors": {
"cold": 1.1,
"hot": 0.2,
"dry": 0.4,
"forest": 0.9
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"perfect_biomes": {
"name": ".*meadow.*"
},
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/trees/dtbwg/species/cika.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,8 @@
}
},
"leaves_properties": "dtbwg:cika",
"environment_factors": {
"hot": 0.8,
"dry": 0.75,
"wet": 0.9
},
"preferred_climate": "temperate",
"climate_tolerance": 0.45,
"always_show_on_waila": false,
"world_gen_leaf_map_height": 60,
"common_override": {
Expand Down
8 changes: 3 additions & 5 deletions src/main/resources/trees/dtbwg/species/cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@
"world_gen_leaf_map_height": 64,
"growth_logic_kit": "dtbwg:cypress",
"leaves_properties": "dtbwg:cypress",
"environment_factors": {
"hot": 0.7,
"dry": 0.5
},
"preferred_climate": "temperate",
"climate_tolerance": 0.35,
"perfect_biomes": {
"tags": [
"#c:is_swamp",
"#minecraft:is_overworld"
]
},
},
"primitive_sapling": "biomeswevegone:cypress_sapling",
"acceptable_soils": [
"water_like",
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/trees/dtbwg/species/ebony.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
"soil_longevity": 20,
"leaves_properties": "dtbwg:ebony",
"growth_logic_kit": "dtbwg:ebony",
"environment_factors": {
"cold": 0.9,
"hot": 0.75,
"dry": 0.8
},
"preferred_climate": "temperate",
"climate_tolerance": 0.5,
"perfect_biomes": {
"name": ".*ebony.*"
},
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/trees/dtbwg/species/fir.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@
"growth_rate": 0.9,
"growth_logic_kit": "conifer",
"leaves_properties": "dtbwg:fir",
"environment_factors": {
"hot": 0.50,
"dry": 0.25,
"wet": 0.75
},
"preferred_climate": "cold",
"climate_tolerance": 0.4,
"perfect_biomes": {
"tag": "#c:is_coniferous"
},
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/trees/dtbwg/species/giga_blue_spruce.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@
}
},
"leaves_properties": "dtbwg:blue_spruce",
"environment_factors": {
"hot": 0.50,
"dry": 0.25,
"wet": 0.75
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"world_gen_leaf_map_height": 70,
"perfect_biomes": {
"name": "biomeswevegone:frosted_taiga.*"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@
}
},
"leaves_properties": "dtbwg:orange_spruce",
"environment_factors": {
"hot": 0.50,
"dry": 0.25,
"wet": 0.75
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"world_gen_leaf_map_height": 70,
"perfect_biomes": {
"name": "biomeswevegone:.*crimson_tundra.*"
Expand Down
7 changes: 2 additions & 5 deletions src/main/resources/trees/dtbwg/species/giga_red_spruce.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,8 @@
}
},
"leaves_properties": "dtbwg:red_spruce",
"environment_factors": {
"hot": 0.50,
"dry": 0.25,
"wet": 0.75
},
"preferred_climate": "cold",
"climate_tolerance": 0.3,
"world_gen_leaf_map_height": 70,
"perfect_biomes": {
"name": "biomeswevegone:.*crimson_tundra.*"
Expand Down
Loading