Skip to content

Commit

Permalink
feat: add malignant and primal flesh walls
Browse files Browse the repository at this point in the history
  • Loading branch information
@Elenterius
Elenterius committed Aug 16, 2023
1 parent 94b7c55 commit 43cee81
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 9 deletions.
10 changes: 6 additions & 4 deletions src/datagen/java/com/github/elenterius/biomancy/datagen/lang/EnglishLangProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,12 +490,14 @@ private void addBlockTranslations() {

addBlock(ModBlocks.PRIMAL_FLESH, "Primal Flesh Block", "Primitive and pure, you better not touch this with your dirty mitts.");
addBlock(ModBlocks.PRIMAL_FLESH_SLAB, "Primal Flesh Slab", "Primitive and pure, you better not touch this with your dirty mitts.");
addBlock(ModBlocks.PRIMAL_FLESH_STAIRS, "Primal Flesh Stairs", "Stairs made of primal flesh. Feels primitive and pure...");
addBlock(ModBlocks.CORRUPTED_PRIMAL_FLESH, "Corrupted Primal Flesh", "It's no longer pure... Don't deny it. Your dirty mitts caused this!");
addBlock(ModBlocks.PRIMAL_FLESH_STAIRS, "Primal Flesh Stairs", "Stairs made of primal flesh.\nFeels primitive and pure...");
addBlock(ModBlocks.PRIMAL_FLESH_WALL, "Primal Flesh Wall", "Wall of primal flesh. Is this Terraria?\nYou better start running >:D");
addBlock(ModBlocks.CORRUPTED_PRIMAL_FLESH, "Corrupted Primal Flesh", "It's no longer pure... Don't deny it.\nYour dirty mitts caused this!");
addBlock(ModBlocks.MALIGNANT_FLESH, "Malignant Flesh Block", "Looks dangerous, you better not touch it!");
addBlock(ModBlocks.MALIGNANT_FLESH_SLAB, "Malignant Flesh Slab", "Looks off-putting, probably best not to touch it.");
addBlock(ModBlocks.MALIGNANT_FLESH_STAIRS, "Malignant Flesh Stairs", "Stairs made of malignant flesh. Looks diseased...");
addBlock(ModBlocks.MALIGNANT_FLESH_VEINS, "Malignant Flesh Veins", "They look almost feral... you better not touch them.");
addBlock(ModBlocks.MALIGNANT_FLESH_STAIRS, "Malignant Flesh Stairs", "Stairs made of malignant flesh.\nLooks diseased...");
addBlock(ModBlocks.MALIGNANT_FLESH_WALL, "Malignant Flesh Wall", "Wall of malignant flesh.\nIt's coming for you! ;)");
addBlock(ModBlocks.MALIGNANT_FLESH_VEINS, "Malignant Flesh Veins", "They look almost feral...\nyou better not touch them.");
}

private void addEntityTranslations() {
Expand Down
2 changes: 2 additions & 0 deletions src/datagen/java/com/github/elenterius/biomancy/datagen/loot/ModBlockLoot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,13 @@ protected void addTables() {
dropSelf(ModBlocks.PRIMAL_FLESH.get());
add(ModBlocks.PRIMAL_FLESH_SLAB.get(), ModBlockLoot::createDirectionalSlabTable);
dropSelf(ModBlocks.PRIMAL_FLESH_STAIRS.get());
dropSelf(ModBlocks.PRIMAL_FLESH_WALL.get());
dropSelf(ModBlocks.CORRUPTED_PRIMAL_FLESH.get());

dropSelf(ModBlocks.MALIGNANT_FLESH.get());
add(ModBlocks.MALIGNANT_FLESH_SLAB.get(), ModBlockLoot::createDirectionalSlabTable);
dropSelf(ModBlocks.MALIGNANT_FLESH_STAIRS.get());
dropSelf(ModBlocks.MALIGNANT_FLESH_WALL.get());
add(ModBlocks.MALIGNANT_FLESH_VEINS.get(), block -> createMultifaceBlockDrops(block, HAS_SHEARS_OR_SILK_TOUCH));

dropSelf(ModBlocks.VOICE_BOX.get());
Expand Down
2 changes: 2 additions & 0 deletions src/datagen/java/com/github/elenterius/biomancy/datagen/models/ModBlockStateProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,13 @@ protected void registerStatesAndModels() {
simpleBlockWithItem(ModBlocks.PRIMAL_FLESH);
directionalSlabBlockWithItem(ModBlocks.PRIMAL_FLESH_SLAB, ModBlocks.PRIMAL_FLESH);
stairsBlockWithItem(ModBlocks.PRIMAL_FLESH_STAIRS, ModBlocks.PRIMAL_FLESH);
wallBlock(ModBlocks.PRIMAL_FLESH_WALL, ModBlocks.PRIMAL_FLESH);
existingBlockWithItem(ModBlocks.CORRUPTED_PRIMAL_FLESH);

simpleBlockWithItem(ModBlocks.MALIGNANT_FLESH);
directionalSlabBlockWithItem(ModBlocks.MALIGNANT_FLESH_SLAB, ModBlocks.MALIGNANT_FLESH);
stairsBlockWithItem(ModBlocks.MALIGNANT_FLESH_STAIRS, ModBlocks.MALIGNANT_FLESH);
wallBlock(ModBlocks.MALIGNANT_FLESH_WALL, ModBlocks.MALIGNANT_FLESH);
veinsBlock(ModBlocks.MALIGNANT_FLESH_VEINS);

irisDoor(ModBlocks.FLESH_IRIS_DOOR, true);
Expand Down
2 changes: 2 additions & 0 deletions src/datagen/java/com/github/elenterius/biomancy/datagen/models/ModItemModelProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ protected void registerModels() {
basicItem(ModItems.FULL_FLESH_DOOR);
wallBlockItem(ModItems.FLESH_WALL);
wallBlockItem(ModItems.PACKED_FLESH_WALL);
wallBlockItem(ModItems.MALIGNANT_FLESH_WALL);
wallBlockItem(ModItems.PRIMAL_FLESH_WALL);
flatBlockItem(ModItems.FLESH_LADDER);
flatBlockItem(ModItems.MALIGNANT_FLESH_VEINS);

Expand Down
4 changes: 4 additions & 0 deletions src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/ModRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ private void registerWorkbenchRecipes(Consumer<FinishedRecipe> consumer) {
stairs(consumer, ModItems.PRIMAL_FLESH_STAIRS.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
slab(consumer, ModItems.PRIMAL_FLESH_SLAB.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
blockFromSlabs(consumer, ModItems.PRIMAL_FLESH_BLOCK.get(), ModItems.PRIMAL_FLESH_SLAB.get());
wall(consumer, ModItems.PRIMAL_FLESH_WALL.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PRIMAL_FLESH_WALL.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PRIMAL_FLESH_STAIRS.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PRIMAL_FLESH_SLAB.get(), ModItems.PRIMAL_FLESH_BLOCK.get(), 2);

Expand All @@ -333,6 +335,8 @@ private void registerWorkbenchRecipes(Consumer<FinishedRecipe> consumer) {
stairs(consumer, ModItems.MALIGNANT_FLESH_STAIRS.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
slab(consumer, ModItems.MALIGNANT_FLESH_SLAB.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
blockFromSlabs(consumer, ModItems.MALIGNANT_FLESH_BLOCK.get(), ModItems.MALIGNANT_FLESH_SLAB.get());
wall(consumer, ModItems.MALIGNANT_FLESH_WALL.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.MALIGNANT_FLESH_WALL.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.MALIGNANT_FLESH_STAIRS.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.MALIGNANT_FLESH_SLAB.get(), ModItems.MALIGNANT_FLESH_BLOCK.get(), 2);

Expand Down
7 changes: 6 additions & 1 deletion src/datagen/java/com/github/elenterius/biomancy/datagen/tags/ModBlockTagsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ protected void addTags() {
tag(BlockTags.FENCES).addTag(ModBlockTags.FLESHY_FENCES);
tag(BlockTags.FENCE_GATES).add(ModBlocks.FLESH_FENCE_GATE.get());

tag(BlockTags.WALLS).add(ModBlocks.FLESH_WALL.get(), ModBlocks.PACKED_FLESH_WALL.get());
tag(BlockTags.WALLS).add(
ModBlocks.FLESH_WALL.get(),
ModBlocks.PACKED_FLESH_WALL.get(),
ModBlocks.MALIGNANT_FLESH_WALL.get(),
ModBlocks.PRIMAL_FLESH_WALL.get()
);

tag(BlockTags.STAIRS).add(
ModBlocks.FLESH_STAIRS.get(),
Expand Down
12 changes: 8 additions & 4 deletions src/generated/resources/assets/biomancy/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,17 +218,21 @@
"block.biomancy.primal_flesh_slab": "Primal Flesh Slab",
"block.biomancy.primal_flesh_slab.tooltip": "Primitive and pure, you better not touch this with your dirty mitts.",
"block.biomancy.primal_flesh_stairs": "Primal Flesh Stairs",
"block.biomancy.primal_flesh_stairs.tooltip": "Stairs made of primal flesh. Feels primitive and pure...",
"block.biomancy.primal_flesh_stairs.tooltip": "Stairs made of primal flesh.\nFeels primitive and pure...",
"block.biomancy.primal_flesh_wall": "Primal Flesh Wall",
"block.biomancy.primal_flesh_wall.tooltip": "Wall of primal flesh. Is this Terraria?\nYou better start running >:D",
"block.biomancy.corrupted_primal_flesh": "Corrupted Primal Flesh",
"block.biomancy.corrupted_primal_flesh.tooltip": "It's no longer pure... Don't deny it. Your dirty mitts caused this!",
"block.biomancy.corrupted_primal_flesh.tooltip": "It's no longer pure... Don't deny it.\nYour dirty mitts caused this!",
"block.biomancy.malignant_flesh": "Malignant Flesh Block",
"block.biomancy.malignant_flesh.tooltip": "Looks dangerous, you better not touch it!",
"block.biomancy.malignant_flesh_slab": "Malignant Flesh Slab",
"block.biomancy.malignant_flesh_slab.tooltip": "Looks off-putting, probably best not to touch it.",
"block.biomancy.malignant_flesh_stairs": "Malignant Flesh Stairs",
"block.biomancy.malignant_flesh_stairs.tooltip": "Stairs made of malignant flesh. Looks diseased...",
"block.biomancy.malignant_flesh_stairs.tooltip": "Stairs made of malignant flesh.\nLooks diseased...",
"block.biomancy.malignant_flesh_wall": "Malignant Flesh Wall",
"block.biomancy.malignant_flesh_wall.tooltip": "Wall of malignant flesh.\nIt's coming for you! ;)",
"block.biomancy.malignant_flesh_veins": "Malignant Flesh Veins",
"block.biomancy.malignant_flesh_veins.tooltip": "They look almost feral... you better not touch them.",
"block.biomancy.malignant_flesh_veins.tooltip": "They look almost feral...\nyou better not touch them.",
"entity.biomancy.hungry_flesh_blob": "Hungry Flesh Blob",
"entity.biomancy.flesh_blob": "Flesh Blob",
"entity.biomancy.legacy_flesh_blob": "Legacy Flesh Blob",
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/github/elenterius/biomancy/init/ModBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,12 @@ public final class ModBlocks {
public static final RegistryObject<FleshBlock> PRIMAL_FLESH = register("primal_flesh", FleshBlock::new);
public static final RegistryObject<StairBlock> PRIMAL_FLESH_STAIRS = registerStairs(PRIMAL_FLESH, StairBlock::new);
public static final RegistryObject<DirectionalSlabBlock> PRIMAL_FLESH_SLAB = registerSlab(PRIMAL_FLESH, DirectionalSlabBlock::new);
public static final RegistryObject<WallBlock> PRIMAL_FLESH_WALL = registerWall(PRIMAL_FLESH, WallBlock::new);
public static final RegistryObject<FleshBlock> CORRUPTED_PRIMAL_FLESH = register("corrupted_primal_flesh", FleshBlock::new);
public static final RegistryObject<FleshBlock> MALIGNANT_FLESH = register("malignant_flesh", FleshBlock::new);
public static final RegistryObject<StairBlock> MALIGNANT_FLESH_STAIRS = registerStairs(MALIGNANT_FLESH, StairBlock::new);
public static final RegistryObject<DirectionalSlabBlock> MALIGNANT_FLESH_SLAB = registerSlab(MALIGNANT_FLESH, DirectionalSlabBlock::new);
public static final RegistryObject<WallBlock> MALIGNANT_FLESH_WALL = registerWall(MALIGNANT_FLESH, WallBlock::new);
public static final RegistryObject<FleshVeinsBlock> MALIGNANT_FLESH_VEINS = register("malignant_flesh_veins", properties -> new FleshVeinsBlock(properties.noCollission().noOcclusion()));

//## Misc
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/com/github/elenterius/biomancy/init/ModItems.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,12 @@ public final class ModItems {
public static final RegistryObject<SimpleBlockItem> PRIMAL_FLESH_BLOCK = registerSimpleBlockItem(ModBlocks.PRIMAL_FLESH);
public static final RegistryObject<SimpleBlockItem> PRIMAL_FLESH_SLAB = registerSimpleBlockItem(ModBlocks.PRIMAL_FLESH_SLAB);
public static final RegistryObject<SimpleBlockItem> PRIMAL_FLESH_STAIRS = registerSimpleBlockItem(ModBlocks.PRIMAL_FLESH_STAIRS);
public static final RegistryObject<ObfuscatedTooltipBlockItem> PRIMAL_FLESH_WALL = registerBlockItem(ModBlocks.PRIMAL_FLESH_WALL, ObfuscatedTooltipBlockItem::new);
public static final RegistryObject<SimpleBlockItem> CORRUPTED_PRIMAL_FLESH_BLOCK = registerSimpleBlockItem(ModBlocks.CORRUPTED_PRIMAL_FLESH);
public static final RegistryObject<SimpleBlockItem> MALIGNANT_FLESH_BLOCK = registerSimpleBlockItem(ModBlocks.MALIGNANT_FLESH);
public static final RegistryObject<SimpleBlockItem> MALIGNANT_FLESH_SLAB = registerSimpleBlockItem(ModBlocks.MALIGNANT_FLESH_SLAB);
public static final RegistryObject<SimpleBlockItem> MALIGNANT_FLESH_STAIRS = registerSimpleBlockItem(ModBlocks.MALIGNANT_FLESH_STAIRS);
public static final RegistryObject<ObfuscatedTooltipBlockItem> MALIGNANT_FLESH_WALL = registerBlockItem(ModBlocks.MALIGNANT_FLESH_WALL, ObfuscatedTooltipBlockItem::new);
public static final RegistryObject<SimpleBlockItem> MALIGNANT_FLESH_VEINS = registerSimpleBlockItem(ModBlocks.MALIGNANT_FLESH_VEINS);

//## Misc
Expand Down

0 comments on commit 43cee81

Please sign in to comment.