fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add flamecatcher spell, and addItemExtras hook for SpellConjuration

Browse Source
This commit is contained in:
Electroblob77
2020-10-21 22:23:54 +01:00
parent d85441867e
commit 2bb242e6fb
44 changed files with 622 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/registry/Spells.java
+2
View File
@@ -253,6 +253,7 @@ public final class Spells {
public static final Spell radiant_totem = placeholder();
public static final Spell firestorm = placeholder();
public static final Spell flamecatcher = placeholder();
public static final Spell zombie_apocalypse = placeholder();
public static final Spell boulder = placeholder();
public static final Spell celestial_smite = placeholder();
@@ -472,6 +473,7 @@ public final class Spells {
registry.register(new RadiantTotem());
registry.register(new Firestorm());
registry.register(new Flamecatcher());
registry.register(new ZombieApocalypse());
registry.register(new Boulder());
registry.register(new CelestialSmite());
src/main/java/electroblob/wizardry/registry/WizardryEntities.java
+1
View File
@@ -112,6 +112,7 @@ public class WizardryEntities {
registry.register(createEntry(EntityForceArrow.class, "force_arrow", TrackingType.PROJECTILE).build());
registry.register(createEntry(EntityDart.class, "dart", TrackingType.PROJECTILE).build());
registry.register(createEntry(EntityIceLance.class, "ice_lance", TrackingType.PROJECTILE).build());
registry.register(createEntry(EntityFlamecatcherArrow.class, "flamecatcher_arrow", TrackingType.PROJECTILE).build());
// Directionless projectiles
registry.register(createEntry(EntityFirebomb.class, "firebomb", TrackingType.PROJECTILE).build());
src/main/java/electroblob/wizardry/registry/WizardryItems.java
+2
View File
@@ -212,6 +212,7 @@ public final class WizardryItems {
public static final Item spectral_boots = placeholder();
public static final Item lightning_hammer = placeholder();
public static final Item flamecatcher = placeholder();
public static final Item ring_condensing = placeholder();
public static final Item ring_siphoning = placeholder();
@@ -583,6 +584,7 @@ public final class WizardryItems {
registerItem(registry, "spectral_boots", new ItemSpectralArmour(ArmorMaterial.IRON, 1, EntityEquipmentSlot.FEET));
registerItem(registry, "lightning_hammer", new ItemLightningHammer());
registerItem(registry, "flamecatcher", new ItemFlamecatcher());
registerItem(registry, "ring_condensing", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.RING));
registerItem(registry, "ring_siphoning", new ItemArtefact(EnumRarity.UNCOMMON, ItemArtefact.Type.RING));
src/main/java/electroblob/wizardry/registry/WizardrySounds.java
+3
View File
@@ -43,6 +43,8 @@ public final class WizardrySounds {
public static final SoundEvent ITEM_PURIFYING_ELIXIR_DRINK = createSound("item.purifying_elixir.drink");
public static final SoundEvent ITEM_MANA_FLASK_USE = createSound("item.mana_flask.use");
public static final SoundEvent ITEM_MANA_FLASK_RECHARGE = createSound("item.mana_flask.recharge");
public static final SoundEvent ITEM_FLAMECATCHER_SHOOT = createSound("item.flamecatcher.shoot");
public static final SoundEvent ITEM_FLAMECATCHER_FLAME = createSound("item.flamecatcher.flame");
public static final SoundEvent ENTITY_BLACK_HOLE_AMBIENT = createSound("entity.black_hole.ambient");
public static final SoundEvent ENTITY_BLACK_HOLE_VANISH = createSound("entity.black_hole.vanish");
@@ -124,6 +126,7 @@ public final class WizardrySounds {
public static final SoundEvent ENTITY_FIREBOMB_THROW = createSound("entity.firebomb.throw");
public static final SoundEvent ENTITY_FIREBOMB_SMASH = createSound("entity.firebomb.smash");
public static final SoundEvent ENTITY_FIREBOMB_FIRE = createSound("entity.firebomb.fire");
public static final SoundEvent ENTITY_FLAMECATCHER_ARROW_HIT = createSound("entity.flamecatcher_arrow.hit");
public static final SoundEvent ENTITY_FORCE_ARROW_HIT = createSound("entity.force_arrow.hit");
public static final SoundEvent ENTITY_FORCE_ORB_HIT = createSound("entity.force_orb.hit");
public static final SoundEvent ENTITY_FORCE_ORB_HIT_BLOCK = createSound("entity.force_orb.hit_block");