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.

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

Adding Trees, Treeblocks, and Signs #596

Merged
merged 53 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
d92c782
Merge branch 'lunar-sway:1.20.1' into AspectTrees
glubtier Mar 16, 2024
5a26ba9
Merge branch 'lunar-sway:1.20.1' into Signs
glubtier Mar 16, 2024
daf4448
Add signs and hanging signs
glubtier Mar 17, 2024
938bb22
Add signs and hanging signs
glubtier Mar 24, 2024
d3cdc3a
Merge remote-tracking branch 'source/upcoming-content' into Signs
glubtier Mar 24, 2024
e3072cb
Rename files to be in line with standards
glubtier Mar 24, 2024
51bb5c7
Add lacquered signs
glubtier Mar 24, 2024
198bf70
Make Blue and Thought dirt mineable with shovel
glubtier Mar 24, 2024
739ba8b
End tree updates
glubtier Apr 1, 2024
663e61d
Merge remote-tracking branch 'source/upcoming-content' into Signs
glubtier Apr 2, 2024
e84ff15
Corrected issue with previous commit
glubtier Apr 2, 2024
1b87d83
Add frost sapling/tree
glubtier Apr 5, 2024
b807c7b
Merge remote-tracking branch 'origin/AspectTrees' into Signs
glubtier Apr 6, 2024
984b35f
Add block sets for Minestuck blocks
glubtier Apr 6, 2024
9820d3d
More Aspect tree blocks
glubtier Apr 6, 2024
b742004
More Aspect tree blocks
glubtier Apr 7, 2024
9f777d2
Aspect tree textures
glubtier Apr 7, 2024
1ca80a0
Moved registration for WoodTypes to function init in MSWoodTypes
glubtier Apr 7, 2024
4fcdf15
Merge MSBlockEntities into MSBlockEntityTypes
glubtier Apr 7, 2024
0e23506
Merge ModEventClientBusEvents into ClientProxy
glubtier Apr 7, 2024
f564301
Move MSSignBlockEntity and MSHangingSignBlockEntity into blockentity …
glubtier Apr 7, 2024
20c777c
Moved MSBlockSetType to block package
glubtier Apr 9, 2024
b683c37
Moved MSBlockSetType to block package and updated stones & metals to …
glubtier Apr 9, 2024
fcc1f45
Updated standing signs and wall signs objects to StandingSignBlock an…
glubtier Apr 9, 2024
475c09a
Merge remote-tracking branch 'origin/Signs' into Signs
glubtier Apr 9, 2024
def4239
Moved contents of registerRenderers() to registerBER()
glubtier Apr 9, 2024
c74f688
change to BER to register through event
glubtier Apr 9, 2024
dc7e24f
Moved MSWoodTypes to block package
glubtier Apr 9, 2024
42265cb
Adding aspect trees
glubtier Apr 12, 2024
774242a
Remove individual aspect sapling blocks, readd AspectSaplingBlock to …
glubtier Apr 12, 2024
4bde5e2
Add ASPECT_TREE_PLACEABLE tag for spawning/placing aspect trees in di…
glubtier Apr 12, 2024
6c91eba
Aspect tree spawning and other tweaks
glubtier Apr 12, 2024
aab88b9
Removed commented line
glubtier Apr 12, 2024
c7d2598
Added comment to sign block classes
glubtier Apr 12, 2024
f886fee
Add frost trees to frost land terrain gen
glubtier Apr 13, 2024
6ec2815
Merge remote-tracking branch 'source/upcoming-content' into Signs
glubtier Apr 13, 2024
271b7e2
Tree cleanup
glubtier Apr 13, 2024
d9293f4
Tree cleanup
glubtier Apr 13, 2024
b86b94f
Changed aspect tree rarity
glubtier Apr 13, 2024
e739ca7
Removed errant import
glubtier Apr 13, 2024
76eb376
Added carved planks recipe, common recipes for planks and wood, added…
glubtier Apr 13, 2024
9112a4f
Standardize contribution name for sipherNil
Dweblenod Apr 13, 2024
27ad495
- Changed registry and variable name of sign block entity
Dweblenod Apr 13, 2024
0c0fa8b
- Added ASPECT_WOOD block tag and included stripped variants in the l…
Dweblenod Apr 13, 2024
312d8d8
Fixed heart trapdoor size
Dweblenod Apr 13, 2024
d1b5445
Merge remote-tracking branch 'mraof/upcoming-content' into Signs
Dweblenod Apr 13, 2024
ba66436
Fix wood type registering
kirderf1 Apr 13, 2024
6da4628
Change javadoc for minestuck signs
kirderf1 Apr 13, 2024
ae1b21d
Change MSHangingSignBlockEntity to override HangingSignBlockEntity
kirderf1 Apr 13, 2024
46cc5f1
Use SignBlockEntity instead of MSSignBlockEntity
kirderf1 Apr 13, 2024
d45f919
Change MSHangingSignBlockEntity to extend SignBlockEntity again
kirderf1 Apr 13, 2024
adafddc
Merge branch 'upcoming-content' into Signs
kirderf1 Apr 13, 2024
5fe290c
Clean up AspectTreeBlocksData
kirderf1 Apr 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions CHANGELOG.md
kirderf1 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [Unreleased]

## [1.20.1-1.11.2.1] - 2024-03-10

### Fixed

- Metal Boats no longer crash the game when dispensed
Expand All @@ -78,6 +80,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
- Advanced color selection screen no longer tints buttons
- Round the displayed max health value on the echeladder screen
- Prevent one method of captchaloguing stacks with stack size larger than max stack size
- Stopped editmode cursor from spinning

### Contributors for this release

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ org.gradle.daemon=false

mc_version=1.20.1

mc_ms_version=1.20.1-1.11.2.0
mc_ms_version=1.20.1-1.11.2.1

mc_forge_version=1.20.1-47.1.3

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/blood_aspect_carved_planks"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/blood_aspect_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/blood_aspect_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/blood_aspect_stripped_log",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/blood_aspect_stripped_log"
},
"axis=z": {
"model": "minestuck:block/blood_aspect_stripped_log",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/blood_aspect_stripped_wood",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/blood_aspect_stripped_wood"
},
"axis=z": {
"model": "minestuck:block/blood_aspect_stripped_wood",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/blood_aspect_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/blood_aspect_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/blood_aspect_wood",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/blood_aspect_wood"
},
"axis=z": {
"model": "minestuck:block/blood_aspect_wood",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/breath_aspect_carved_planks"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/breath_aspect_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/breath_aspect_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/breath_aspect_stripped_log",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/breath_aspect_stripped_log"
},
"axis=z": {
"model": "minestuck:block/breath_aspect_stripped_log",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/breath_aspect_stripped_wood",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/breath_aspect_stripped_wood"
},
"axis=z": {
"model": "minestuck:block/breath_aspect_stripped_wood",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/breath_aspect_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/breath_aspect_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/breath_aspect_wood",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/breath_aspect_wood"
},
"axis=z": {
"model": "minestuck:block/breath_aspect_wood",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/carved_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/carved_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/carved_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/carved_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/cindered_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/cindered_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/cindered_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/cindered_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/dead_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/dead_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/dead_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/dead_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/doom_aspect_carved_planks"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/doom_aspect_hanging_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "minestuck:block/doom_aspect_sign"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/doom_aspect_stripped_log",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/doom_aspect_stripped_log"
},
"axis=z": {
"model": "minestuck:block/doom_aspect_stripped_log",
"x": 90
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"axis=x": {
"model": "minestuck:block/doom_aspect_stripped_wood",
"x": 90,
"y": 90
},
"axis=y": {
"model": "minestuck:block/doom_aspect_stripped_wood"
},
"axis=z": {
"model": "minestuck:block/doom_aspect_stripped_wood",
"x": 90
}
}
}
Loading