-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
44 changed files
with
774 additions
and
218 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/generated/resources/.cache/82dbd4df3226a8f2ebd864eec8c96cc5d0540266
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
src/generated/resources/assets/dynamictrees/blockstates/mangrove_roots.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "variants": { | ||
| "layer=covered": { | ||
| "model": "minecraft:block/mud" | ||
| }, | ||
| "layer=exposed": { | ||
| "model": "dynamictrees:block/mangrove_roots" | ||
| }, | ||
| "layer=filled": { | ||
| "model": "dynamictrees:block/mangrove_roots_filled" | ||
| } | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
src/generated/resources/assets/dynamictrees/models/block/mangrove_roots.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "loader": "dynamictrees:branch", | ||
| "render_type": "minecraft:cutout_mipped", | ||
| "textures": { | ||
| "bark": "minecraft:block/mangrove_roots_side", | ||
| "rings": "minecraft:block/mangrove_roots_top" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/dynamictrees/models/block/mangrove_roots_filled.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "loader": "dynamictrees:branch", | ||
| "textures": { | ||
| "bark": "minecraft:block/muddy_mangrove_roots_side", | ||
| "rings": "minecraft:block/muddy_mangrove_roots_top" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius1.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius1", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius2", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius3.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius3", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius4.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius4", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius5.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius5", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius6.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius6", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius7.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius7", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...erated/resources/assets/dynamictrees/models/block/rooty_mangrove_root_collar_radius8.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:block/smartmodel/rooty/aerial_roots_radius8", | ||
| "textures": { | ||
| "end": "minecraft:block/mangrove_log", | ||
| "end": "minecraft:block/mangrove_log_top", | ||
| "side": "minecraft:block/mangrove_log" | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/assets/dynamictrees/models/item/mangrove_roots.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "parent": "dynamictrees:item/root_branch", | ||
| "textures": { | ||
| "bark": "minecraft:block/mangrove_roots_side", | ||
| "rings": "minecraft:block/mangrove_roots_top" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
src/main/java/com/ferreusveritas/dynamictrees/api/data/RootsItemModelGenerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package com.ferreusveritas.dynamictrees.api.data; | ||
|
|
||
| import com.ferreusveritas.dynamictrees.data.provider.DTItemModelProvider; | ||
| import com.ferreusveritas.dynamictrees.tree.family.Family; | ||
| import com.ferreusveritas.dynamictrees.tree.family.MangroveFamily; | ||
| import net.minecraft.world.item.Item; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraftforge.client.model.generators.ItemModelBuilder; | ||
| import net.minecraftforge.registries.ForgeRegistries; | ||
|
|
||
| /** | ||
| * @author Harley O'Connor | ||
| */ | ||
| public class RootsItemModelGenerator implements Generator<DTItemModelProvider, Family> { | ||
|
|
||
| public static final DependencyKey<Item> ROOT_ITEM = new DependencyKey<>("root_item"); | ||
| public static final DependencyKey<Block> PRIMITIVE_ROOT = new DependencyKey<>("primitive_root"); | ||
| @Override | ||
| public void generate(DTItemModelProvider provider, Family input, Dependencies dependencies) { | ||
| final ItemModelBuilder builder = provider.withExistingParent( | ||
| String.valueOf(ForgeRegistries.ITEMS.getKey(dependencies.get(ROOT_ITEM))), | ||
| input.getRootItemParentLocation() | ||
| ); | ||
| input.addRootTextures( | ||
| builder::texture, | ||
| provider.block(ForgeRegistries.BLOCKS.getKey(dependencies.get(PRIMITIVE_ROOT))) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public Dependencies gatherDependencies(Family input) { | ||
| MangroveFamily mangroveInput = (MangroveFamily) input; | ||
| return new Dependencies() | ||
| .append(ROOT_ITEM, mangroveInput.getRootItem()) | ||
| .append(PRIMITIVE_ROOT, mangroveInput.getPrimitiveRoots()); | ||
| } | ||
|
|
||
| } |
56 changes: 56 additions & 0 deletions
56
src/main/java/com/ferreusveritas/dynamictrees/api/data/RootsStateGenerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package com.ferreusveritas.dynamictrees.api.data; | ||
|
|
||
| import com.ferreusveritas.dynamictrees.block.branch.BranchBlock; | ||
| import com.ferreusveritas.dynamictrees.block.branch.roots.BasicRootsBlock; | ||
| import com.ferreusveritas.dynamictrees.data.provider.BranchLoaderBuilder; | ||
| import com.ferreusveritas.dynamictrees.data.provider.DTBlockStateProvider; | ||
| import com.ferreusveritas.dynamictrees.tree.family.Family; | ||
| import com.ferreusveritas.dynamictrees.tree.family.MangroveFamily; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraftforge.registries.ForgeRegistries; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * @author Harley O'Connor | ||
| */ | ||
| public class RootsStateGenerator implements Generator<DTBlockStateProvider, Family> { | ||
|
|
||
| public static final DependencyKey<BranchBlock> ROOT = new DependencyKey<>("root"); | ||
| public static final DependencyKey<Block> PRIMITIVE_ROOT = new DependencyKey<>("primitive_root"); | ||
| public static final DependencyKey<Block> PRIMITIVE_FILLED_ROOT = new DependencyKey<>("filled_primitive_root"); | ||
| public static final DependencyKey<Block> PRIMITIVE_COVERED_ROOT = new DependencyKey<>("covered_primitive_root"); | ||
|
|
||
| @Override | ||
| public void generate(DTBlockStateProvider provider, Family input, Dependencies dependencies) { | ||
| final BranchBlock root = dependencies.get(ROOT); | ||
| final BranchLoaderBuilder builderExposed = provider.models().getBuilder( | ||
| Objects.requireNonNull(ForgeRegistries.BLOCKS.getKey(root)).getPath() | ||
| ).customLoader(root.getFamily().getBranchLoaderConstructor()); | ||
| input.addRootTextures(builderExposed::texture, provider.block(ForgeRegistries.BLOCKS.getKey(dependencies.get(PRIMITIVE_ROOT)))); | ||
|
|
||
| final BranchLoaderBuilder builderFilled = provider.models().getBuilder( | ||
| Objects.requireNonNull(ForgeRegistries.BLOCKS.getKey(root)).getPath() + "_filled" | ||
| ).customLoader(root.getFamily().getBranchLoaderConstructor()); | ||
| input.addRootTextures(builderFilled::texture, provider.block(ForgeRegistries.BLOCKS.getKey(dependencies.get(PRIMITIVE_FILLED_ROOT)))); | ||
|
|
||
| provider.getVariantBuilder(root) | ||
| .partialState().with(BasicRootsBlock.LAYER, BasicRootsBlock.Layer.EXPOSED) | ||
| .modelForState().modelFile(builderExposed.end().renderType("cutout_mipped")).addModel() | ||
| .partialState().with(BasicRootsBlock.LAYER, BasicRootsBlock.Layer.FILLED) | ||
| .modelForState().modelFile(builderFilled.end()).addModel() | ||
| .partialState().with(BasicRootsBlock.LAYER, BasicRootsBlock.Layer.COVERED) | ||
| .modelForState().modelFile(provider.models().getExistingFile(provider.blockTexture(dependencies.get(PRIMITIVE_COVERED_ROOT)))).addModel(); | ||
| } | ||
|
|
||
| @Override | ||
| public Dependencies gatherDependencies(Family input) { | ||
| MangroveFamily mangroveInput = (MangroveFamily) input; | ||
| return new Dependencies() | ||
| .append(ROOT, mangroveInput.getRoot()) | ||
| .append(PRIMITIVE_ROOT, mangroveInput.getPrimitiveRoots()) | ||
| .append(PRIMITIVE_FILLED_ROOT, mangroveInput.getPrimitiveFilledRoots()) | ||
| .append(PRIMITIVE_COVERED_ROOT, mangroveInput.getPrimitiveCoveredRoots()); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.