Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-11-26 05:08:34 +01:00
Code Issues Projects Releases Wiki Activity

made the animal effect require the powder to be present

Browse source
This commit is contained in:
Ellpeck 2019-02-10 14:13:42 +01:00
parent d15a1455b8
commit 2c06c3d2c6
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/de/ellpeck/naturesaura/chunk/effect/AnimalEffect.java
View file

@ -53,7 +53,7 @@ public class AnimalEffect implements IDrainSpotEffect {
return -1; return -1;
if (!this.bb.contains(player.getPositionVector())) if (!this.bb.contains(player.getPositionVector()))
return -1; return -1;
if (NaturesAuraAPI.instance().isEffectPowderActive(player.world, player.getPosition(), NAME)) if (!NaturesAuraAPI.instance().isEffectPowderActive(player.world, player.getPosition(), NAME))
return 0; return 0;
return 1; return 1;
} }
@ -77,7 +77,7 @@ public class AnimalEffect implements IDrainSpotEffect {
for (EntityItem item : items) { for (EntityItem item : items) {
if (item.isDead) if (item.isDead)
continue; continue;
if (NaturesAuraAPI.instance().isEffectPowderActive(world, item.getPosition(), NAME)) if (!NaturesAuraAPI.instance().isEffectPowderActive(world, item.getPosition(), NAME))
continue; continue;
ItemStack stack = item.getItem(); ItemStack stack = item.getItem();
@ -111,7 +111,7 @@ public class AnimalEffect implements IDrainSpotEffect {
EntityAnimal first = animals.get(world.rand.nextInt(animals.size())); EntityAnimal first = animals.get(world.rand.nextInt(animals.size()));
if (first.isChild() || first.isInLove()) if (first.isChild() || first.isInLove())
return; return;
if (NaturesAuraAPI.instance().isEffectPowderActive(world, first.getPosition(), NAME)) if (!NaturesAuraAPI.instance().isEffectPowderActive(world, first.getPosition(), NAME))
return; return;
Optional<EntityAnimal> secondOptional = animals.stream() Optional<EntityAnimal> secondOptional = animals.stream()

2
src/main/java/de/ellpeck/naturesaura/chunk/effect/DrainSpotEffects.java
View file

@ -17,6 +17,6 @@ public final class DrainSpotEffects {
NaturesAuraAPI.EFFECT_POWDERS.put(PlantBoostEffect.NAME, 0xc2f442); NaturesAuraAPI.EFFECT_POWDERS.put(PlantBoostEffect.NAME, 0xc2f442);
NaturesAuraAPI.EFFECT_POWDERS.put(CacheRechargeEffect.NAME, 0x1fb0d1); NaturesAuraAPI.EFFECT_POWDERS.put(CacheRechargeEffect.NAME, 0x1fb0d1);
NaturesAuraAPI.EFFECT_POWDERS.put(AnimalEffect.NAME, 0xba1010); NaturesAuraAPI.EFFECT_POWDERS.put(AnimalEffect.NAME, 0xc842f4);
} }
} }

2
src/main/java/de/ellpeck/naturesaura/recipes/ModRecipes.java
View file

@ -105,7 +105,7 @@ public final class ModRecipes {
Ingredient.fromItem(ModItems.AURA_CACHE)).register(); Ingredient.fromItem(ModItems.AURA_CACHE)).register();
new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "animal_powder"), new TreeRitualRecipe(new ResourceLocation(NaturesAura.MOD_ID, "animal_powder"),
Ingredient.fromStacks(new ItemStack(Blocks.SAPLING, 1, 3)), Ingredient.fromStacks(new ItemStack(Blocks.SAPLING, 1, 3)),
ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 24), AnimalEffect.NAME), 400, ItemEffectPowder.setEffect(new ItemStack(ModItems.EFFECT_POWDER, 8), AnimalEffect.NAME), 400,
Helper.blockIng(ModBlocks.GOLD_POWDER), Helper.blockIng(ModBlocks.GOLD_POWDER),
Helper.blockIng(ModBlocks.GOLD_POWDER), Helper.blockIng(ModBlocks.GOLD_POWDER),
Ingredient.fromItem(ModItems.SKY_INGOT), Ingredient.fromItem(ModItems.SKY_INGOT),

2
src/main/resources/assets/naturesaura/lang/en_US.lang
View file

@ -76,7 +76,7 @@ item.naturesaura.infused_iron_pants.name=Botanist's Leggings
item.naturesaura.infused_iron_shoes.name=Botanist's Shoes item.naturesaura.infused_iron_shoes.name=Botanist's Shoes
item.naturesaura.effect_powder.naturesaura:plant_boost.name=Powder of Steady Growth item.naturesaura.effect_powder.naturesaura:plant_boost.name=Powder of Steady Growth
item.naturesaura.effect_powder.naturesaura:cache_recharge.name=Powder of no Storage item.naturesaura.effect_powder.naturesaura:cache_recharge.name=Powder of no Storage
item.naturesaura.effect_powder.naturesaura:animal.name=Powder of Chastity item.naturesaura.effect_powder.naturesaura:animal.name=Powder of Fertility
item.naturesaura.mover_cart.name=Aura Attraction Cart item.naturesaura.mover_cart.name=Aura Attraction Cart
item.naturesaura.range_visualizer.name=Mystical Magnifier item.naturesaura.range_visualizer.name=Mystical Magnifier
item.naturesaura.clock_hand.name=Hand of Time item.naturesaura.clock_hand.name=Hand of Time

6
src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/effects/animal.json
View file

@ -6,16 +6,16 @@
"pages": [ "pages": [
{ {
"type": "text", "type": "text",
"text": "When the amount of $(aura) in an area increases beyond about two thirds of the $(l:items/eye)Environmental Eye$()'s gauge, it starts to affect the $(item)animals$() in the area: Cows, sheep, pigs and the like will start $(thing)mating$() without any encouragement occasionally, draining some of the $(aura) in the process as if falling in love because of its power." "text": "When the amount of $(aura) in an area increases beyond about two thirds of the $(l:items/eye)Environmental Eye$()'s gauge, and there is some $(l:effects/effect_powder)Powder of Fertility$() nearby, it starts to affect the $(item)animals$() in the area: Cows, sheep, pigs and the like will start $(thing)mating$() without any encouragement occasionally, draining some of the $(aura) in the process as if falling in love because of its power."
}, },
{ {
"type": "text", "type": "text",
"text": "Additionally, $(item)Eggs$() that have been laying around on the ground as an item for a while will have a chance to $(thing)hatch$() into a chicken without needing to be thrown.$(p)Note that both of these effects will cease to occur once there are enough animals present in the area, preventing overpopulation." "text": "Additionally, $(item)Eggs$() that have been laying around on the ground as an item for a while will $(thing)hatch$() into a chicken without needing to be thrown.$(p)Note that both of these effects will cease to occur once there are enough animals present in the area, preventing overpopulation."
}, },
{ {
"type": "naturesaura:tree_ritual", "type": "naturesaura:tree_ritual",
"recipe": "naturesaura:animal_powder", "recipe": "naturesaura:animal_powder",
"text": "This effect can be inhibited using $(l:effects/effect_powder)Powder of Chastity$()." "text": "Creating the $(l:effects/effect_powder)Powder of Fertility$()."
} }
] ]
} }