Skip to content
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

Fallen Trunk #2321

Merged
merged 63 commits into from
Jan 4, 2025
Merged

Fallen Trunk #2321

Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
7ee34f9
Register FallenTrunkStructure
Sleepy-Horse Oct 28, 2024
f6740ad
Generate FallenTrunkStructure; place sponge as a placeholder
Sleepy-Horse Oct 31, 2024
3612d20
Spawn trunk
Sleepy-Horse Oct 31, 2024
a4ba5a8
Generate log trunk with moss patches, chests, a spawner, and holes
Sleepy-Horse Nov 2, 2024
c5a6584
Make hole's shape a sphere
Sleepy-Horse Nov 6, 2024
7d425c0
Add the small trunk
Sleepy-Horse Nov 6, 2024
47ea25b
Change hole generation algorithm
Sleepy-Horse Nov 15, 2024
57d16d7
Add eroded ends to small trunk; rework the generation of trunk
Sleepy-Horse Nov 22, 2024
60a567a
Merge branch '1.21.1' into no-build/1.21.1-fallen-trunk
Sleepy-Horse Nov 23, 2024
092b8fc
Run datagen
Sleepy-Horse Nov 25, 2024
fc94679
Stop placing spawner outside the chunk
Sleepy-Horse Nov 25, 2024
5065e9b
Fix connection of moss patches
Sleepy-Horse Nov 25, 2024
75f6fa7
Fix bounding box of the FallenTrunkStructure
Sleepy-Horse Nov 25, 2024
35aa326
Replace flowers during the generation of FallenTrunkPiece
Sleepy-Horse Nov 25, 2024
cdcd602
Add mounds(prototype); don't spawn fallen trunks in incorrect biomes;…
Sleepy-Horse Dec 9, 2024
c457d0e
Fix a bug, where eroded end wasn't generate properly; remove warnings
Sleepy-Horse Dec 10, 2024
0cc30ac
Don't create hollow hill functions for every block for fallen trunk's…
Sleepy-Horse Dec 13, 2024
e53dc6b
Make mounds depend on the radius of the trunk
Sleepy-Horse Dec 13, 2024
4db34a0
Reduce the height of mounds
Sleepy-Horse Dec 18, 2024
e8eebdf
Rename variable d for better readability
Sleepy-Horse Dec 18, 2024
ab0f273
Remove magic number
Sleepy-Horse Dec 18, 2024
4b1e35e
Fix a bug where a mound could be too close to the ends of its trunk.
Sleepy-Horse Dec 18, 2024
1f0ec0a
Generate several mounds
Sleepy-Horse Dec 18, 2024
f165918
Randomize side of the mounds correctly
Sleepy-Horse Dec 19, 2024
88e53e0
Increase amount of mounds for big trunks
Sleepy-Horse Dec 19, 2024
8df01e5
Comment debugging printHole
Sleepy-Horse Dec 19, 2024
e00983b
Comment debugging blockEdges
Sleepy-Horse Dec 19, 2024
7313b41
Refactor moundApex to a constant
Sleepy-Horse Dec 19, 2024
ceb15e7
Remove blockEdges form FallenTrunkPiece
Sleepy-Horse Dec 19, 2024
0e4c903
Use random.nextBoolean() for trunk holes
Sleepy-Horse Dec 20, 2024
d3e59c0
Reduce copy-paste
Sleepy-Horse Dec 20, 2024
334a0f1
Send blockPos in logger report
Sleepy-Horse Dec 22, 2024
79b9963
Remove debug function placeBlockEdges
Sleepy-Horse Dec 23, 2024
23a51cc
Change fields from private to protected
Sleepy-Horse Dec 23, 2024
96d8079
Make the hole a field in FallenTrunkPiece; remove magic number in Hol…
Sleepy-Horse Dec 23, 2024
82b2298
Avoid generation of big mounds next to trunk holes
Sleepy-Horse Dec 28, 2024
7549c4f
Add support for different trunk rotations in mound generation
Sleepy-Horse Dec 29, 2024
e5e4465
Add zOffset
Sleepy-Horse Dec 29, 2024
4c32b8c
Add orientation support correctly
Sleepy-Horse Dec 29, 2024
228f724
Call random.next() constant amount of times in placeLog()
Sleepy-Horse Dec 29, 2024
78026dc
Fix a double rotation bug
Sleepy-Horse Dec 29, 2024
7285179
Randomize size of mounds
Sleepy-Horse Dec 29, 2024
afa6989
Merge branch '1.21.1' into no-build/1.21.1-fallen-trunk
Sleepy-Horse Dec 29, 2024
5266a88
Remove unused import
Sleepy-Horse Dec 29, 2024
d73afdd
Run datagen
Sleepy-Horse Dec 29, 2024
839cdf6
Remove debug line
Sleepy-Horse Dec 29, 2024
89a9fd7
Use Objects.requireNonNull
Sleepy-Horse Dec 30, 2024
3a56ae4
Update error message to direct users to github issues
Sleepy-Horse Dec 30, 2024
3268e3d
Avoid a double compute
Sleepy-Horse Dec 30, 2024
9bbb842
Remove System.out.println
Sleepy-Horse Dec 30, 2024
67dee4f
Add a new loot table for FallenTrunkStructure to exclude magic tree s…
Sleepy-Horse Dec 31, 2024
ffe0409
Randomize chests positions in FallenTrunkPiece
Sleepy-Horse Dec 31, 2024
8d8ba28
Merge remote-tracking branch 'origin/no-build/1.21.1-fallen-trunk' in…
Sleepy-Horse Dec 31, 2024
02449d1
Use TWILIGHT_OAK_CHEST instead of vanilla one
Sleepy-Horse Dec 31, 2024
7d85bd4
Create chests and a spawner in FallenTrunkPiece with 50% chance
Sleepy-Horse Dec 31, 2024
d6ad37a
Remove double chest from FallenTrunkPiece
Sleepy-Horse Dec 31, 2024
53c42ab
Randomize monster in spawner; make SPAWNER_MONSTERS a protected stati…
Sleepy-Horse Dec 31, 2024
b3338ec
Simplify possibleChestsOffsets generation
Sleepy-Horse Dec 31, 2024
27d2fd9
Return 0 when we calculate mound contribution inside the trunk
Sleepy-Horse Jan 1, 2025
f2e2f1a
Run datagen
Sleepy-Horse Jan 1, 2025
6ffaa29
Fix map-save bug for terraforming piece
Drullkus Jan 3, 2025
854fa6e
Merge branch '1.21.1' into no-build/1.21.1-fallen-trunk
Sleepy-Horse Jan 4, 2025
0116338
Run datagen
Sleepy-Horse Jan 4, 2025
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
Prev Previous commit
Next Next commit
Merge branch '1.21.1' into no-build/1.21.1-fallen-trunk 
# Conflicts:
#	src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
  • Loading branch information
@Sleepy-Horse
Sleepy-Horse committed Jan 4, 2025
commit 854fa6e1dffd10c2d4b3f995a5752d72ecfa8b8a
2 changes: 1 addition & 1 deletion src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

You are viewing a condensed version of this merge commit. You can view the full changes here.