Skip to content

brine brambles float down now #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
birsy merged 3 commits into from
Feb 3, 2026
Merged

brine brambles float down now #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57baf05
bramble upgrade
Arathain Feb 2, 2026
c2fc022
bramble upgrade
Arathain Feb 2, 2026
aa8e598
Merge remote-tracking branch 'origin/neoforge-1.21' into neoforge-1.21
Arathain Feb 3, 2026
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
6 changes: 5 additions & 1 deletion src/main/java/birsy/clinker/common/world/block/plant/ThornyStemBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.SupportType;
import net.minecraft.world.level.block.SweetBerryBushBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.phys.AABB;
Expand Down Expand Up @@ -76,7 +77,10 @@ protected void entityInside(BlockState state, Level level, BlockPos pos, Entity
}
}
if (inside) {
entity.hurt(level.damageSources().cactus(), 1);
if(entity.tickCount % 20 < 12 && entity.tickCount % 3 == 0 && (entity.xOld != entity.getX() || entity.zOld != entity.getZ())) {
entity.hurt(level.damageSources().cactus(), 1);
entity.invulnerableTime = 11;
}
boolean onClimbable = entity instanceof LivingEntity livingEntity && livingEntity.onClimbable();
if (entity.getDeltaMovement().y < 0 || onClimbable) {
entity.makeStuckInBlock(state, new Vec3(1, 0.8, 1));
Expand Down
90 changes: 82 additions & 8 deletions src/main/java/birsy/clinker/common/world/level/gen/content/feature/BrineBrambleFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.WorldGenLevel;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.PipeBlock;
import net.minecraft.world.level.block.SupportType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.levelgen.feature.Feature;
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
Expand All @@ -21,6 +19,8 @@
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class BrineBrambleFeature extends Feature<NoneFeatureConfiguration> {
public BrineBrambleFeature(Codec<NoneFeatureConfiguration> config) {
Expand All @@ -38,18 +38,38 @@ public boolean place(FeaturePlaceContext<NoneFeatureConfiguration> context) {
ArrayList<BlockPos> ps = new ArrayList<>();
ArrayList<BlockPos> escrow = new ArrayList<>();
int budget;
ps.add(origin.mutable());

for(Direction d : Direction.values()) {
escrow.clear();
tgt = origin.mutable();
budget = 12;
if(d == Direction.DOWN)
continue;

escrow.clear();
tgt = origin.mutable();
budget = 37;

ps.add(tgt.relative(d));
escrow.add(tgt.relative(d));


propagateBramble(ps, escrow, level, d, tgt, random, budget);
propagateBrambleDown(ps, level, tgt, random, budget);
//propagateBramble(ps, escrow, level, d, tgt, random, budget);
}

escrow.addAll(ps);

int top = 8;

for(BlockPos p : escrow) {
if(random.nextFloat() > 1f - 0.3f/(1f+Math.sqrt(p.distSqr(origin)))) {
top -= 1;
budget = 15;
propagateBrambleDown(ps, level, p, random, budget);

if(top <= 0) {
break;
}
}
}

placeBramble(ps, level, origin, random);
Expand All @@ -75,8 +95,10 @@ private static int propagateBramble(ArrayList<BlockPos> tgts, ArrayList<BlockPos

BlockPos tgt = pos.relative(nd);
BlockState s = level.getBlockState(bp.relative(nd));
BlockState s2 = level.getBlockState(bp.relative(nd).relative(Direction.DOWN));
BlockState s3 = level.getBlockState(bp.relative(nd).relative(Direction.DOWN, 2));

if(s.canBeReplaced() && rs.nextFloat() > (d == Direction.UP ? 0.8 : d == Direction.DOWN ? -0.1 : 0.25)) {
if(s.canBeReplaced() && (s2.isSolid() || s3.isSolid()) && rs.nextFloat() > (d == Direction.UP ? 0.9 : d == Direction.DOWN ? 0. : 0.35)) {
tgts.add(tgt);
tgtEscrow.add(tgt);

Expand All @@ -101,13 +123,65 @@ private static int propagateBramble(ArrayList<BlockPos> tgts, ArrayList<BlockPos
return budget;
}

private static final List<Direction> dirs = Arrays.stream(Direction.values()).filter(Direction.Plane.HORIZONTAL).toList();



private static int propagateBrambleDown(ArrayList<BlockPos> tgts, WorldGenLevel level, BlockPos bp, RandomSource rs, int budget) {
if(budget <= 0) {
return 0;
}

BlockPos.MutableBlockPos tgt = bp.mutable();
BlockPos.MutableBlockPos tgtB = bp.relative(Direction.DOWN).mutable();
while(budget > 0) {
if(!level.getBlockState(tgtB).canBeReplaced()) {
int r = rs.nextInt(4);
boolean noEsc = true;
for(int ui = 0; ui < 4; ui++) {
int i = (ui + r) % 4;
Direction dir = dirs.get(i);
tgt.move(dir);
if(level.getBlockState(tgt).canBeReplaced()) {
tgts.add(tgt.immutable());
tgtB.move(dir);
budget -= 1;
noEsc = false;
break;
}
}
if(noEsc) {
budget = 0;
}
} else {
if(rs.nextFloat() > 0.7) {
Direction d2 = Direction.fromYRot(budget % 2 * 180 + (((budget + 1)*0.5) % 2 * 90));
if(level.getBlockState(tgt.relative(d2)).canBeReplaced()) {
tgt.move(d2);
tgts.add(tgt.immutable());
tgtB.move(d2);
}
}
tgt.move(Direction.DOWN);
tgts.add(tgt.immutable());
tgtB.move(Direction.DOWN);
budget -= 1;
}

}

return budget;
}

private static final Vec3 up = new Vec3(0., 1., 0.);

private void placeBramble(ArrayList<BlockPos> positions, WorldGenLevel l, BlockPos p, RandomSource r) {
for(BlockPos pos : positions) {
if(pos.getY() > p.getY() + 2)
continue;
Block ds = (pos.getCenter().subtract(p.getBottomCenter()).dot(up) < .5 + r.nextFloat() * 2.) ? ClinkerBlocks.THORNY_STEM.get() : ClinkerBlocks.SALTY_STEM.get();
Block ds = (-pos.getCenter().subtract(p.getBottomCenter()).dot(up) < .5 + r.nextFloat() * 2.) ? ClinkerBlocks.THORNY_STEM.get() : ClinkerBlocks.SALTY_STEM.get();
if(!l.getBlockState(pos).canBeReplaced())
continue;

BlockState s = getStateForPlacement(l, pos, p, positions, ds.defaultBlockState());
if(s != null)
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/data/clinker/worldgen/placed_feature/brine_bramble.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"type": "minecraft:count",
"count": {
"type": "minecraft:uniform",
"min_inclusive": 1,
"max_inclusive": 1
"min_inclusive": 2,
"max_inclusive": 5
}
},
{
Expand Down
Loading