diff --git a/src/main/java/mod/acgaming/spackenmobs/ModEntities.java b/src/main/java/mod/acgaming/spackenmobs/ModEntities.java index 02174da..cd14076 100644 --- a/src/main/java/mod/acgaming/spackenmobs/ModEntities.java +++ b/src/main/java/mod/acgaming/spackenmobs/ModEntities.java @@ -34,9 +34,10 @@ import net.minecraftforge.fml.common.registry.EntityRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ModEntities { - - public static void init() { +public class ModEntities +{ + public static void init() + { int id = 1; EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:smava_creeper"), EntitySmavaCreeper.class, "smava_creeper", id++, Spackenmobs.instance, 64, 1, true, 7649828, 11053224); EntityRegistry.registerModEntity(new ResourceLocation("spackenmobs:marcell_davis"), EntityMarcellDAvis.class, "marcell_davis", id++, Spackenmobs.instance, 64, 1, true, 15759, 16777215); diff --git a/src/main/resources/assets/spackenmobs/sounds.json b/src/main/resources/assets/spackenmobs/sounds.json index 1484ede..bb3933b 100644 --- a/src/main/resources/assets/spackenmobs/sounds.json +++ b/src/main/resources/assets/spackenmobs/sounds.json @@ -245,7 +245,9 @@ "spackenmobs:drachenlord/say25", "spackenmobs:drachenlord/say26", "spackenmobs:drachenlord/say27", - "spackenmobs:drachenlord/say28" + "spackenmobs:drachenlord/say28", + "spackenmobs:drachenlord/say29", + "spackenmobs:drachenlord/say30" ] }, "entities.drachenlord.angry": { @@ -259,7 +261,17 @@ "spackenmobs:drachenlord/angry7", "spackenmobs:drachenlord/angry8", "spackenmobs:drachenlord/angry9", - "spackenmobs:drachenlord/angry10" + "spackenmobs:drachenlord/angry10", + "spackenmobs:drachenlord/angry11", + "spackenmobs:drachenlord/angry12", + "spackenmobs:drachenlord/angry13", + "spackenmobs:drachenlord/angry14", + "spackenmobs:drachenlord/angry15", + "spackenmobs:drachenlord/angry16", + "spackenmobs:drachenlord/angry17", + "spackenmobs:drachenlord/angry18", + "spackenmobs:drachenlord/angry19", + "spackenmobs:drachenlord/angry20" ] }, "entities.drachenlord.death": { @@ -272,7 +284,8 @@ "spackenmobs:drachenlord/hurt1", "spackenmobs:drachenlord/hurt2", "spackenmobs:drachenlord/hurt3", - "spackenmobs:drachenlord/hurt4" + "spackenmobs:drachenlord/hurt4", + "spackenmobs:drachenlord/hurt5" ] }, "entities.schalker.ambient": { @@ -316,12 +329,25 @@ "spackenmobs:jens/say3", "spackenmobs:jens/say4", "spackenmobs:jens/say5", - "spackenmobs:jens/say6" + "spackenmobs:jens/say6", + "spackenmobs:jens/say7", + "spackenmobs:jens/say8", + "spackenmobs:jens/say9", + "spackenmobs:jens/say10", + "spackenmobs:jens/say11", + "spackenmobs:jens/say12", + "spackenmobs:jens/say13", + "spackenmobs:jens/say14" ] }, "entities.jens.death": { "sounds": [ - "spackenmobs:jens/death1" + "spackenmobs:jens/death1", + "spackenmobs:jens/death2", + "spackenmobs:jens/death3", + "spackenmobs:jens/death4", + "spackenmobs:jens/death5", + "spackenmobs:jens/death6" ] }, "entities.jens.hurt": { @@ -331,7 +357,11 @@ "spackenmobs:jens/hurt3", "spackenmobs:jens/hurt4", "spackenmobs:jens/hurt5", - "spackenmobs:jens/hurt6" + "spackenmobs:jens/hurt6", + "spackenmobs:jens/hurt7", + "spackenmobs:jens/hurt8", + "spackenmobs:jens/hurt9", + "spackenmobs:jens/hurt10" ] } } \ No newline at end of file diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry11.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry11.ogg new file mode 100644 index 0000000..4d5fe9c Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry11.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry12.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry12.ogg new file mode 100644 index 0000000..f41ce30 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry12.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry13.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry13.ogg new file mode 100644 index 0000000..b23af9a Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry13.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry14.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry14.ogg new file mode 100644 index 0000000..caf00c5 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry14.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry15.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry15.ogg new file mode 100644 index 0000000..c07411e Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry15.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry16.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry16.ogg new file mode 100644 index 0000000..e291d1a Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry16.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry17.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry17.ogg new file mode 100644 index 0000000..3e3e89e Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry17.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry18.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry18.ogg new file mode 100644 index 0000000..7b44f01 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry18.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry19.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry19.ogg new file mode 100644 index 0000000..380c181 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry19.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry20.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry20.ogg new file mode 100644 index 0000000..8c4b1ca Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/angry20.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/hurt5.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/hurt5.ogg new file mode 100644 index 0000000..a6890aa Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/hurt5.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/say29.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/say29.ogg new file mode 100644 index 0000000..c8b19f7 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/say29.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/drachenlord/say30.ogg b/src/main/resources/assets/spackenmobs/sounds/drachenlord/say30.ogg new file mode 100644 index 0000000..a2dafd0 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/drachenlord/say30.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/death4.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/death4.ogg new file mode 100644 index 0000000..7e0ff14 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/death4.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/death5.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/death5.ogg new file mode 100644 index 0000000..7764233 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/death5.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/death6.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/death6.ogg new file mode 100644 index 0000000..d99635b Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/death6.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/hurt10.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/hurt10.ogg new file mode 100644 index 0000000..68b9896 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/hurt10.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/hurt8.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/hurt8.ogg new file mode 100644 index 0000000..69e8cf4 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/hurt8.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/hurt9.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/hurt9.ogg new file mode 100644 index 0000000..01a134f Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/hurt9.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/say10.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/say10.ogg new file mode 100644 index 0000000..88a7e96 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/say10.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/say11.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/say11.ogg new file mode 100644 index 0000000..f6197a9 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/say11.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/say12.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/say12.ogg new file mode 100644 index 0000000..22a243c Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/say12.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/say13.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/say13.ogg new file mode 100644 index 0000000..dc33770 Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/say13.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/say14.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/say14.ogg new file mode 100644 index 0000000..039e94c Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/say14.ogg differ diff --git a/src/main/resources/assets/spackenmobs/sounds/jens/say9.ogg b/src/main/resources/assets/spackenmobs/sounds/jens/say9.ogg new file mode 100644 index 0000000..facefdf Binary files /dev/null and b/src/main/resources/assets/spackenmobs/sounds/jens/say9.ogg differ