Skip to content

Commit a8868dc

Browse files
supermassimosupermassimo
committed
ported changes from 1.20 branch
1 parent 68e819f commit a8868dc

7 files changed

Lines changed: 36 additions & 15 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ configurations {
8787
dependencies {
8888
implementation "net.neoforged:neoforge:${neo_version}"
8989

90-
//implementation 'curse.maven:dynamictrees-252818:7201567'
91-
implementation 'com.dtteam.dynamictrees:dynamictrees-neoforge-1.21.1:1.6.0-BETA03'
90+
implementation 'curse.maven:dynamictrees-252818:7513464'
91+
//implementation 'com.dtteam.dynamictrees:dynamictrees-neoforge-1.21.1:1.6.0-BETA03'
9292

9393
runtimeOnly 'curse.maven:jade-324717:6291517'
9494
runtimeOnly "curse.maven:jei-238222:5846880"

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
mod_id=dynamictreesplus
33
mod_name=Dynamic Trees Plus
44
mod_license=MIT
5-
mod_version=1.3.1-BETA01
6-
version_type=beta
5+
mod_version=1.3.1
6+
version_type=stable
77
mod_group_id=com.dtteam.dynamictreesplus
88
mod_authors=Ferreusveritas, Max Hyper, Harley O'Connor
99
mod_credits=

‎src/main/java/com/dtteam/dynamictreesplus/DynamicTreesPlus.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public class DynamicTreesPlus {
3333
public DynamicTreesPlus(IEventBus modBus, ModContainer modContainer) {
3434

3535
modContainer.registerConfig(ModConfig.Type.SERVER, DTPConfigs.SERVER_CONFIG);
36+
modContainer.registerConfig(ModConfig.Type.COMMON, DTPConfigs.COMMON_CONFIG);
3637

3738
modBus.addListener(this::clientSetup);
3839
modBus.addListener(this::commonSetup);

‎src/main/java/com/dtteam/dynamictreesplus/block/mushroom/DynamicCapBlock.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@
99
import com.dtteam.dynamictrees.systems.GrowSignal;
1010
import com.dtteam.dynamictrees.tree.family.Family;
1111
import com.dtteam.dynamictreesplus.systems.mushroomlogic.MushroomCapDisc;
12-
import net.minecraft.world.entity.Entity;
13-
import net.minecraft.world.entity.LivingEntity;
14-
import net.minecraft.world.level.LevelReader;
15-
import net.minecraft.world.phys.Vec3;
1612
import net.minecraft.core.BlockPos;
1713
import net.minecraft.core.Direction;
1814
import net.minecraft.server.level.ServerLevel;
1915
import net.minecraft.util.RandomSource;
16+
import net.minecraft.world.entity.Entity;
17+
import net.minecraft.world.entity.LivingEntity;
2018
import net.minecraft.world.entity.player.Player;
2119
import net.minecraft.world.item.ItemStack;
2220
import net.minecraft.world.item.context.BlockPlaceContext;
2321
import net.minecraft.world.level.BlockGetter;
2422
import net.minecraft.world.level.Level;
2523
import net.minecraft.world.level.LevelAccessor;
24+
import net.minecraft.world.level.LevelReader;
2625
import net.minecraft.world.level.block.Block;
2726
import net.minecraft.world.level.block.HugeMushroomBlock;
2827
import net.minecraft.world.level.block.PipeBlock;
@@ -31,6 +30,7 @@
3130
import net.minecraft.world.level.block.state.properties.IntegerProperty;
3231
import net.minecraft.world.level.material.FluidState;
3332
import net.minecraft.world.phys.HitResult;
33+
import net.minecraft.world.phys.Vec3;
3434
import org.jetbrains.annotations.Nullable;
3535

3636
public class DynamicCapBlock extends HugeMushroomBlock implements TreePart, UpdatesSurroundNeighbors {

‎src/main/java/com/dtteam/dynamictreesplus/init/DTPConfigs.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,18 @@
1010
public class DTPConfigs {
1111

1212
public static ModConfigSpec SERVER_CONFIG;
13-
// public static ModConfigSpec COMMON_CONFIG;
13+
public static ModConfigSpec COMMON_CONFIG;
1414
// public static ModConfigSpec CLIENT_CONFIG;
1515

1616
public static final ModConfigSpec.BooleanValue CAN_BONE_MEAL_CACTUS;
1717
public static final ModConfigSpec.BooleanValue CACTUS_PRICKLE_ON_MOVE_ONLY;
1818
public static final ModConfigSpec.BooleanValue CACTUS_KILL_ITEMS;
19+
public static final ModConfigSpec.BooleanValue REPLACE_MUSHROOM_SAPLING_ON_PLACEMENT;
20+
public static final ModConfigSpec.BooleanValue REPLACE_MUSHROOM_SAPLING_ON_GROWTH;
1921

2022
static {
2123
final ModConfigSpec.Builder SERVER_BUILDER = new ModConfigSpec.Builder();
22-
// final ModConfigSpec.Builder COMMON_BUILDER = new ModConfigSpec.Builder();
24+
final ModConfigSpec.Builder COMMON_BUILDER = new ModConfigSpec.Builder();
2325
// final ModConfigSpec.Builder CLIENT_BUILDER = new ModConfigSpec.Builder();
2426

2527
SERVER_BUILDER.comment("Cactus Settings").push("cactus");
@@ -31,14 +33,18 @@ public class DTPConfigs {
3133
define("cactusKillItems", false);
3234
SERVER_BUILDER.pop();
3335

34-
SERVER_BUILDER.comment("Mushroom Settings").push("mushroom.json");
35-
SERVER_BUILDER.pop();
36-
3736
SERVER_BUILDER.comment("Miscellaneous").push("misc");
3837
SERVER_BUILDER.pop();
3938

39+
COMMON_BUILDER.comment("Mushroom Settings").push("mushroom");
40+
REPLACE_MUSHROOM_SAPLING_ON_PLACEMENT = COMMON_BUILDER.comment("Only relevant if 'replaceVanillaSapling' to be set to TRUE in Dynamic Trees common config. If enabled mushrooms will be replaced by their dynamic counterparts as soon as they are placed.").
41+
define("replaceMushroomSaplingOnPlacement", false);
42+
REPLACE_MUSHROOM_SAPLING_ON_GROWTH = COMMON_BUILDER.comment("Only relevant if 'replaceVanillaSapling' to be set to TRUE in Dynamic Trees common config. If enabled mushrooms will be replaced by their dynamic counterparts when they grow into a giant mushroom.").
43+
define("replaceMushroomSaplingOnGrowth", true);
44+
COMMON_BUILDER.pop();
45+
4046
SERVER_CONFIG = SERVER_BUILDER.build();
41-
// COMMON_CONFIG = COMMON_BUILDER.build();
47+
COMMON_CONFIG = COMMON_BUILDER.build();
4248
// CLIENT_CONFIG = CLIENT_BUILDER.build();
4349
}
4450

‎src/main/java/com/dtteam/dynamictreesplus/tree/HugeMushroomSpecies.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import com.dtteam.dynamictreesplus.block.mushroom.CapProperties;
3535
import com.dtteam.dynamictreesplus.block.mushroom.DynamicCapBlock;
3636
import com.dtteam.dynamictreesplus.block.mushroom.DynamicCapCenterBlock;
37+
import com.dtteam.dynamictreesplus.init.DTPConfigs;
3738
import com.dtteam.dynamictreesplus.init.DTPRegistries;
3839
import com.dtteam.dynamictreesplus.systems.mushroomlogic.MushroomShapeConfiguration;
3940
import com.dtteam.dynamictreesplus.systems.mushroomlogic.context.MushroomCapContext;
@@ -200,6 +201,19 @@ public ResourceLocation getSaplingSmartModelLocation() {
200201
return DynamicTrees.location("block/smartmodel/mushroom_" + (this.getSaplingShape() == CommonVoxelShapes.FLAT_MUSHROOM ? "flat" : "round"));
201202
}
202203

204+
public boolean shouldReplaceSaplingWhenPlaced(BlockState originalSapling) {
205+
if (DTPConfigs.REPLACE_MUSHROOM_SAPLING_ON_PLACEMENT.get())
206+
return super.shouldReplaceSaplingWhenPlaced(originalSapling);
207+
return false;
208+
}
209+
210+
@Override
211+
public boolean shouldReplaceSaplingWhenGrown(BlockState originalSapling) {
212+
if (DTPConfigs.REPLACE_MUSHROOM_SAPLING_ON_GROWTH.get())
213+
return super.shouldReplaceSaplingWhenGrown(originalSapling);
214+
return false;
215+
}
216+
203217
@Override
204218
public boolean isAcceptableSoil(LevelReader level, BlockPos pos, BlockState soilBlockState) {
205219
return (SoilHelper.isSoilAcceptable(soilBlockState, soilTypeFlags) || level.getRawBrightness(pos.above(), 0) <= getMaxLightForPlanting())

‎src/main/resources/META-INF/neoforge.mods.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ credits='''${mod_credits}'''
3232
[[dependencies.${mod_id}]]
3333
modId="dynamictrees"
3434
mandatory=true
35-
versionRange="[1.5.0-BETA5,)"
35+
versionRange="[1.6.0,)"
3636
ordering="AFTER"
3737
side="BOTH"

0 commit comments

Comments
 (0)