Skip to content

Commit

Permalink
add(ominous eye item)
Browse files Browse the repository at this point in the history
  • Loading branch information
nvb-uy committed Sep 2, 2024
1 parent aaf781d commit 3e5d61c
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "eldritch_end:item/ominous_eye"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public void generateItemModels(ItemModelGenerator generator) {

generator.register(ItemRegistry.ETYR_UPGRADE_TEMPLATE, Models.GENERATED);
generator.register(ItemRegistry.CORRUPTION_UPGRADE_PATTERN, Models.GENERATED);
generator.register(ItemRegistry.OMINOUS_EYE, Models.GENERATED);
// generator.register(ItemRegistry.HASTUR_CROWN, Models.GENERATED);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package elocindev.eldritch_end.entity.ominous_eye;

import net.minecraft.entity.EntityType;
import net.minecraft.entity.ai.goal.ActiveTargetGoal;
import net.minecraft.entity.ai.goal.FlyGoal;
import net.minecraft.entity.ai.goal.LookAtEntityGoal;
import net.minecraft.entity.mob.VexEntity;
Expand All @@ -12,10 +13,12 @@ public OminousEyeEntity(EntityType<? extends VexEntity> entityType, World world)
super(entityType, world);
}

@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected void initGoals() {
super.initGoals();
this.goalSelector.add(4, new FlyGoal(this, 1.0));
this.goalSelector.add(1, new LookAtEntityGoal(this, PlayerEntity.class, 5.0f, 1.0f));
this.goalSelector.add(1, new LookAtEntityGoal(this, PlayerEntity.class, 15.0f, 1.0f));
this.targetSelector.add(3, new ActiveTargetGoal(this, PlayerEntity.class, true));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.ArrayList;

public class AberrationHeartItem extends SummonPartItem implements InfusableItemMaterial {

public AberrationHeartItem(Settings settings, RitualStructure ritualStructure, Block mainSummonBlock, BlockState aftermathBlock, EntityType<?> summon, boolean shouldSpawnLightning, List<Identifier> allowed_biomes) {
super(settings, ritualStructure, mainSummonBlock, aftermathBlock, summon, shouldSpawnLightning, allowed_biomes);
}
Expand Down Expand Up @@ -99,7 +98,7 @@ public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> too
super.appendTooltip(stack, world, tooltip, context);

var appliesto = Configs.Mechanics.INFUSIONS.corruption_infusion.can_apply_to_armor && Configs.Mechanics.INFUSIONS.corruption_infusion.can_apply_to_weapons ?
"infusion.eldritch_end.applies_to_all" :
"infusion.eldritch_end.applies_to_all" :
Configs.Mechanics.INFUSIONS.corruption_infusion.can_apply_to_armor ?
"infusion.eldritch_end.applies_to_armor" :
"infusion.eldritch_end.applies_to_weapons";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ public class ItemRegistry {
public static final Item NECRONOMICON = reg(new Necronomicon(new FabricItemSettings()), "necronomicon");
public static final Item SILVER_KEY = reg(new SilverKey(new FabricItemSettings()), "silver_key");
public static final Item ABERRATION_LIMB = reg(new AberrationLimbItem(new FabricItemSettings()), "aberration_limb");


public static final Item OMINOUS_EYE = reg(new Item(new FabricItemSettings()), "ominous_eye");

public static final Item XAL = reg(new Xal(new FabricItemSettings().maxCount(1).fireproof()), "xal");

Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/assets/eldritch_end/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"item.eldritch_end.necronomicon": "Necronomicon",
"item.eldritch_end.necronomicon.type": "Eldritch Artifact",
"item.eldritch_end.aberration_limb": "Aberration's Limb",
"item.eldritch_end.ominous_eye": "Ominous Eye",
"item.eldritch_end.aberration_heart": "Aberration's Heart",
"item.eldritch_end.silver_key": "Silver Key",
"item.eldritch_end.raw_etyr": "Raw Etyr",
Expand All @@ -158,11 +159,11 @@
"effect.eldritch_end.hastur_presence": "Hastur's Presence",

"entity.eldritch_end.aberration": "Aberration",
"entity.eldritch_end.ominous_eye": "Ominous Eye",
"entity.eldritch_end.tentacle": "Tentacle",
"entity.eldritch_end.undead_tentacle": "Undead Tentacle",
"entity.eldritch_end.dendler": "Dendler",

"entity.eldritch_end.the_faceless": "The Faceless",
"entity.eldritch_end.hastur": "Hastur's Image",
"entity.eldritch_end.chorb": "Chorb"
"entity.eldritch_end.hastur": "Hastur's Image"
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"type": "minecraft:entity",
"pools": [
{
"bonus_rolls": 0,
"entries": [
{
"type": "minecraft:item",
"name": "eldritch_end:ominous_eye",
"functions": [
{
"function": "minecraft:set_count",
"count": {
"type": "minecraft:uniform",
"min": 1,
"max": 1
}
},
{
"count": {
"type": "minecraft:uniform",
"max": 1,
"min": 0
},
"function": "minecraft:looting_enchant"
}
],
"conditions": [
{
"condition": "minecraft:random_chance",
"chance": 0.15
}
]
}
],
"rolls": 1
}
],
"random_sequence": "eldritch_end:entities/ominous_eye"
}

0 comments on commit 3e5d61c

Please sign in to comment.