Adding Trees, Treeblocks, and Signs #596
Conversation
# Conflicts: # src/main/generated/resources/assets/minestuck/lang/en_us.json
# Conflicts: # src/main/generated/resources/data/minecraft/tags/blocks/wooden_fences.json # src/main/java/com/mraof/minestuck/block/MSBlocks.java # src/main/java/com/mraof/minestuck/data/MSBlockStateProvider.java # src/main/java/com/mraof/minestuck/data/MinestuckEnUsLanguageProvider.java # src/main/java/com/mraof/minestuck/data/loot_table/MSBlockLootTables.java # src/main/java/com/mraof/minestuck/data/tag/MinestuckBlockTagsProvider.java
|
Changelog is also a thing. I assume that additions won't be a problem, but we should take extra care with changes (textures, models and the like) so that we catch changes to preexisting blocks (blocks that have already been released, like frost leaves and shadewood). |
There was a problem hiding this comment.
Looks like some useful changes and additions! Its understandable since you havent had as much experience with our codebase before but there is some classes you added which are derivative of existing code. I pointed out such locations I identified in their own comments.
It also looks like you merged content from the 1.20.1 branch, trying to push those changes to upcoming-content is not the best thing to do here. We can discuss how to remedy that on discord!
src/main/java/com/mraof/minestuck/event/ModEventClientBusEvents.java
Outdated
Show resolved
Hide resolved
It doesn't matter much in this occurrence. Everything in |
Yep! Once I'm actually done with textures and know what is and isn't going in, then I have to go through them all. I'll update the changelog and credits after that. |
This might also be because I had some file issues on my PC and then some merging shenanigans in my own repo. Future PRs shouldn't have any issue but if you have any tips, I'm happy to hear them. GitHub (the site itself) doesn't always make sense to me. |
src/main/java/com/mraof/minestuck/data/MSBlockStateProvider.java
Outdated
Show resolved
Hide resolved
# Conflicts: # src/main/generated/resources/assets/minestuck/lang/en_us.json # src/main/java/com/mraof/minestuck/data/MinestuckEnUsLanguageProvider.java # src/main/java/com/mraof/minestuck/data/loot_table/MSBlockLootTables.java # src/main/java/com/mraof/minestuck/data/recipe/MinestuckRecipeProvider.java # src/main/java/com/mraof/minestuck/item/MSItems.java
|
@kirderf1 Credits! https://docs.google.com/document/d/1MON4wpOaZjSfU_PFoJ_unIyOCggCKknxfZ96HZTj4x0/edit?usp=sharing I tried to note down which textures are new, which ones were modified, which ones were repurposed, etc. I don't care about credits for anything I color-corrected or did some light reshading/retouching, I just included them to be thorough. If I missed something or something is unclear, please DM me! |
src/main/java/com/mraof/minestuck/data/worldgen/MSPlacedFeatureProvider.java
Show resolved
Hide resolved
src/main/java/com/mraof/minestuck/data/worldgen/MSPlacedFeatureProvider.java
Outdated
Show resolved
Hide resolved
src/main/java/com/mraof/minestuck/block/MSStandingSignBlock.java
Outdated
Show resolved
Hide resolved
Dweblenod
removed
the
missing credit
… aspect wood and stripped wood recipes
|
As of now, everything I intended to do is done, short of any fixes or merge conflicts. |
src/main/java/com/mraof/minestuck/data/AspectTreeBlocksData.java
Outdated
Show resolved
Hide resolved
- Removed unused imports - Reordered sign items in AspectTreeBlocks
…og/wood tags - Reordered stripped variants in AspectTreeBlocks
# Conflicts: # CHANGELOG.md
# Conflicts: # CHANGELOG.md # src/main/java/com/mraof/minestuck/world/lands/terrain/RainLandType.java
Signs: Probably the biggest addition here. Required the creation of several classes. Of those, I was unsure if I put some in the right place-
entity.MSBlockEntities - Actually not sure if there already was a class that serves the same purpose? But I couldn't find it.
util.MSWoodTypes - Necessary for signs but not sure if it's better put in util or data or somewhere else.
MSWoodTypes: These are not threadsafe and need to go in enqueueWork, so I added them to mainThreadSetup(). It looks kind of clunky but this is fairly standard implementation, based on other mod repos I've poked around. I think there are better ways, but that's the kind of work I'd like to save for another post-4/13 PR, unless someone is chomping at the bit to take it on now.
End log: I'm not entirely sure what the design intent with the "double log" block was, but in the interest of not reinventing the wheel, I matched the stripped variant to this, and added a third texture for both log and stripped log blocks. (Lovingly named end_log_triple :) For now.) After 4/13, I plan on giving End lands a facelift like we're doing with some of the other lands.
Also as such, the model, blockstate, and item files for the stripped_end_log are hard-coded, like the end_log already is.
MSCreativeTabs: I tried to put all the related tree blocks together, in a similar order to the way vanilla tree blocks are ordered.
MSBlockStateProvider: small change to how the render type is applied to doors.
MSBlockSetType: I added all the woods, as well as all the stones that I could sus out, but I may have missed some. I did not update the BlockSetTypes for anything but the trees/woods I was working on.
Texture Credits:
(see also: https://docs.google.com/document/d/1MON4wpOaZjSfU_PFoJ_unIyOCggCKknxfZ96HZTj4x0/edit?usp=sharing)