Skip to content

Commit

Permalink
feat: rename Bloom related stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Elenterius committed Jan 10, 2024
1 parent f5d5982 commit 926c0cf
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ private void addItemTranslations() {
addItem(ModItems.NUTRIENTS, "Nutrients", "Very hard pellets rich in energy that almost look like vitamin pills.");
addItem(ModItems.NUTRIENT_PASTE, "Nutrient Paste", "Nutrients combined with Biotic Matter to moisten the hard pellets, producing a paste.\nIt almost looks like yellowish cake, and is a convenient source of energy.");
addItem(ModItems.NUTRIENT_BAR, "Nutrient Bar", "Nutrient Paste compressed into the shape of a bar. Looks edible, if a bit bland.");
addItem(ModItems.SAPBERRY, "Sapberry", "An exotic delicacy which grants random potion effects.");
addItem(ModItems.BLOOMBERRY, "Bloomberry", "An exotic delicacy which has a bioluminescent sheen and grants random potion effects when eaten.");

addItem(ModItems.REGENERATIVE_FLUID, "Regenerative Fluid", "A fluid with regenerative properties, used to concoct healing additives.");
addItem(ModItems.WITHERING_OOZE, "Withering Ooze", "A corrosive extract. It likely has uses in bio-alchemy.");
Expand Down Expand Up @@ -490,7 +490,7 @@ private void addBlockTranslations() {
addBlock(ModBlocks.FLESH_LADDER, "Flesh Ladder", "Ladder mainly made of bones and a little bit of flesh...");
addBlock(ModBlocks.YELLOW_BIO_LANTERN, "Yellow Bio-Lantern", "A bioluminescent light source that is energy-efficient and environmentally friendly.");
addBlock(ModBlocks.BLUE_BIO_LANTERN, "Blue Bio-Lantern", "A bioluminescent light source. This one is blue!");
addBlock(ModBlocks.PRIMORDIAL_BIO_LANTERN, "Primordial Bio-Lantern", "A primal light source. This one is magenta!");
addBlock(ModBlocks.PRIMORDIAL_BIO_LANTERN, "Bloom-Lantern", "A magenta light source made from a bioluminescent berry.");
addBlock(ModBlocks.BLOOMLIGHT, "Bloomlight", "A malignant light source. This one is magenta as well!");
addBlock(ModBlocks.TENDON_CHAIN, "Tendon Chain", "A chain made of tendons.");
addBlock(ModBlocks.VIAL_HOLDER, "Vial Holder", "Display and organize your serums.");
Expand All @@ -510,7 +510,7 @@ private void addBlockTranslations() {
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.");
addBlock(ModBlocks.MALIGNANT_BLOOM, "Malignant Bloom", "An exotic flower of primordial beauty.\n\nIt will spread itself by launching it's ripe berry into the air.\nOn impact the berry explodes and spreads malignant veins as well.");
addBlock(ModBlocks.MALIGNANT_BLOOM, "Primal Bloom", "An exotic flower of primordial beauty.\n\nIt will spread itself by launching it's ripe berry into the air.\nOn impact the berry explodes and spreads malignant veins as well.");
addBlock(ModBlocks.PRIMAL_ORIFICE, "Primal Orifice", "A primitive piece full of holes. It seems to leak an acidic substance.");

addBlock(ModBlocks.ACID_FLUID_BLOCK, "Acid");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ protected void registerModels() {
basicItem(ModItems.CREATOR_MIX);
basicItem(ModItems.NUTRIENT_PASTE);
basicItem(ModItems.NUTRIENT_BAR);
basicItem(ModItems.SAPBERRY);
basicItem(ModItems.BLOOMBERRY);
serumItem(ModItems.VIAL);
basicItem(ModItems.GIFT_SAC);
basicItem(ModItems.FERTILIZER);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,22 +336,22 @@ private void registerWorkbenchRecipes(Consumer<FinishedRecipe> consumer) {
.save(consumer);

WorkbenchRecipeBuilder.shaped(ModItems.PRIMORDIAL_BIO_LANTERN.get())
.define('B', ModItems.SAPBERRY.get())
.define('B', ModItems.BLOOMBERRY.get())
.define('V', ModItems.MALIGNANT_FLESH_VEINS.get())
.define('C', ModItems.TENDON_CHAIN.get())
.pattern(" C ")
.pattern("VBV")
.pattern(" V ")
.unlockedBy(hasName(ModItems.SAPBERRY.get()), has(ModItems.SAPBERRY.get()))
.unlockedBy(hasName(ModItems.BLOOMBERRY.get()), has(ModItems.BLOOMBERRY.get()))
.save(consumer);

WorkbenchRecipeBuilder.shaped(ModItems.BLOOMLIGHT.get(), 4)
.define('B', ModItems.SAPBERRY.get())
.define('B', ModItems.BLOOMBERRY.get())
.define('V', ModItems.MALIGNANT_FLESH_VEINS.get())
.pattern("BVB")
.pattern("VBV")
.pattern("BVB")
.unlockedBy(hasName(ModItems.SAPBERRY.get()), has(ModItems.SAPBERRY.get()))
.unlockedBy(hasName(ModItems.BLOOMBERRY.get()), has(ModItems.BLOOMBERRY.get()))
.save(consumer);
}

Expand Down Expand Up @@ -598,12 +598,12 @@ private void registerDecomposingRecipes(Consumer<FinishedRecipe> consumer) {
.addOutput(ModItems.EXOTIC_DUST.get(), 0, 2)
.unlockedBy(ModItems.LIVING_FLESH).save(consumer);

DecomposerRecipeBuilder.create().setIngredient(ModItems.SAPBERRY)
DecomposerRecipeBuilder.create().setIngredient(ModItems.BLOOMBERRY)
.addOutput(ModItems.BIO_LUMENS.get(), 0, 2)
.addOutput(ModItems.ORGANIC_MATTER.get(), 0, 1)
.addOutput(ModItems.EXOTIC_DUST.get(), 0, 3)
.addOutput(ModItems.BILE.get(), 1, 2)
.unlockedBy(ModItems.SAPBERRY).save(consumer);
.unlockedBy(ModItems.BLOOMBERRY).save(consumer);
DecomposerRecipeBuilder.create().setIngredient(ModItems.BLOOMLIGHT)
.addOutput(ModItems.BIO_LUMENS.get(), 5, 9)
.addOutput(ModItems.ORGANIC_MATTER.get(), 2, 3)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player
if (age > 5 && player.getItemInHand(hand).isEmpty()) {
if (!level.isClientSide) {
int count = 1 + (age > 6 ? level.random.nextInt(2) : 0);
popResource(level, pos, new ItemStack(ModItems.SAPBERRY.get(), count));
popResource(level, pos, new ItemStack(ModItems.BLOOMBERRY.get(), count));

player.hurt(DamageSource.SWEET_BERRY_BUSH, 1f);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public final class ModItems {
//# Food/Fuel
public static final RegistryObject<EffectCureItem> NUTRIENT_PASTE = registerItem("nutrient_paste", props -> new EffectCureItem(props.food(ModFoods.NUTRIENT_PASTE)));
public static final RegistryObject<EffectCureItem> NUTRIENT_BAR = registerItem("nutrient_bar", props -> new EffectCureItem(props.food(ModFoods.NUTRIENT_BAR)));
public static final RegistryObject<SapberryItem> SAPBERRY = registerItem("sapberry", props -> new SapberryItem(props.food(ModFoods.NUTRIENT_PASTE)));
public static final RegistryObject<SapberryItem> BLOOMBERRY = registerItem("bloomberry", props -> new SapberryItem(props.food(ModFoods.NUTRIENT_PASTE)));

//# Block Items

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public final class Tributes {
public static final Tribute PRIMORDIAL_CORE = register(ModItems.PRIMORDIAL_CORE.get(), TributeImpl.builder().biomass(80).successModifier(64).anomalyModifier(100).diseaseModifier(50).create());

public static final Tribute LIVING_FLESH = register(ModItems.LIVING_FLESH.get(), TributeImpl.builder().biomass(10).lifeEnergy(10).successModifier(40).anomalyModifier(55).create());
public static final Tribute SAPBERRY = register(ModItems.SAPBERRY.get(), TributeImpl.builder().successModifier(10).lifeEnergy(20).anomalyModifier(20).create());
public static final Tribute BLOOMBERRY = register(ModItems.BLOOMBERRY.get(), TributeImpl.builder().successModifier(10).lifeEnergy(20).anomalyModifier(20).create());
public static final Tribute GOLDEN_APPLE = register(Items.GOLDEN_APPLE, TributeImpl.builder().successModifier(10).hostileModifier(-100).create());
public static final Tribute ENCHANTED_GOLDEN_APPLE = register(Items.ENCHANTED_GOLDEN_APPLE, TributeImpl.builder().lifeEnergy(15).successModifier(40).hostileModifier(-200).create());
public static final Tribute CAKE = register(Items.CAKE, TributeImpl.builder().hostileModifier(-80).diseaseModifier(10).create());
Expand Down

0 comments on commit 926c0cf

Please sign in to comment.