diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 27cb7a6..c944670 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -166,31 +166,31 @@ public class RegisteredResearches { .setParents(researchVRunicShielding.key) .setPages(new ResearchPage("gadomancy.research_page.ETHEREAL_FAMILIAR.1")).registerResearchItem(); - researchFamiliarElementLightning = new SimpleResearchItem("FAMILIAR_SHOCK", 4, -1, 2, Aspect.WEATHER.getImage(), + researchFamiliarElementLightning = new SimpleResearchItem("FAMILIAR_SHOCK", 4, -1, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Lightning.png"), new AspectList().add(Aspect.WEATHER, 4).add(Aspect.WEAPON, 4).add(Aspect.AIR, 8)) .setConcealed() .setParents(researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_SHOCK.1")).registerResearchItem(); - researchFamiliarElementFire = new SimpleResearchItem("FAMILIAR_FIRE", 6, -1, 2, Aspect.FIRE.getImage(), + researchFamiliarElementFire = new SimpleResearchItem("FAMILIAR_FIRE", 6, -1, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Fire.png"), new AspectList().add(Aspect.FIRE, 8).add(Aspect.WEAPON, 4).add(Aspect.MAGIC, 4)) .setConcealed() .setParents(researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_FIRE.1")).registerResearchItem(); - researchFamiliarElementPoison = new SimpleResearchItem("FAMILIAR_POISON", 3, 2, 2, Aspect.POISON.getImage(), + researchFamiliarElementPoison = new SimpleResearchItem("FAMILIAR_POISON", 3, 2, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Poison.png"), new AspectList().add(Aspect.POISON, 8).add(Aspect.WEAPON, 4).add(Aspect.ENTROPY, 4)) .setConcealed() .setParents(researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_POISON.1")).registerResearchItem(); - researchFamiliarElementWeakness = new SimpleResearchItem("FAMILIAR_WEAKNESS", 2, 0, 2, Aspect.TRAP.getImage(), + researchFamiliarElementWeakness = new SimpleResearchItem("FAMILIAR_WEAKNESS", 2, 0, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Enervation.png"), new AspectList().add(Aspect.TRAP, 8).add(Aspect.WEAPON, 8).add(Aspect.TAINT, 6)) .setConcealed() .setParents(researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_WEAKNESS.1")).registerResearchItem(); - researchFamiliarAugmentDamage = new IfAnyParentResearchItem("FAMILIAR_DAMAGE", 8, 2, 2, Aspect.WEAPON.getImage(), + researchFamiliarAugmentDamage = new IfAnyParentResearchItem("FAMILIAR_DAMAGE", 8, 2, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Damage.png"), new AspectList().add(Aspect.WEAPON, 8).add(Aspect.ENERGY, 8).add(Aspect.MAGIC, 4)) .setAnyParents(researchFamiliarElementFire.key, researchFamiliarElementLightning.key, researchFamiliarElementPoison.key, researchFamiliarElementWeakness.key) @@ -198,7 +198,7 @@ public class RegisteredResearches { .setParents(researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_DAMAGE.1")).registerResearchItem(); - researchFamiliarAugmentRange = new IfAnyParentResearchItem("FAMILIAR_RANGE", 6, 4, 2, Aspect.ELDRITCH.getImage(), + researchFamiliarAugmentRange = new IfAnyParentResearchItem("FAMILIAR_RANGE", 6, 4, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Range.png"), new AspectList().add(Aspect.MAGIC, 8).add(Aspect.ELDRITCH, 8).add(Aspect.ORDER, 4)) .setAnyParents(researchFamiliarElementFire.key, researchFamiliarElementLightning.key, researchFamiliarElementPoison.key, researchFamiliarElementWeakness.key) @@ -206,7 +206,7 @@ public class RegisteredResearches { .setParents(researchEtherealFamiliar.key) .setPages(new ResearchPage("gadomancy.research_page.FAMILIAR_RANGE.1")).registerResearchItem(); - researchFamiliarAugmentSpeed = new SimpleResearchItem("FAMILIAR_SPEED", 8, 5, 2, Aspect.MOTION.getImage(), + researchFamiliarAugmentSpeed = new SimpleResearchItem("FAMILIAR_SPEED", 8, 5, 2, new ResourceLocation("gadomancy", "textures/misc/Fam_Speed.png"), new AspectList().add(Aspect.MOTION, 10).add(Aspect.MAGIC, 4).add(Aspect.AURA, 4)) .setConcealed() .setParents(researchFamiliarAugmentDamage.key, researchFamiliarAugmentRange.key) diff --git a/src/main/resources/assets/gadomancy/textures/misc/Attack2.png b/src/main/resources/assets/gadomancy/textures/misc/Attack2.png deleted file mode 100644 index 72ae4a2..0000000 Binary files a/src/main/resources/assets/gadomancy/textures/misc/Attack2.png and /dev/null differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Attack3.png b/src/main/resources/assets/gadomancy/textures/misc/Attack3.png deleted file mode 100644 index cd15a71..0000000 Binary files a/src/main/resources/assets/gadomancy/textures/misc/Attack3.png and /dev/null differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Cooldown1.png b/src/main/resources/assets/gadomancy/textures/misc/Cooldown1.png deleted file mode 100644 index b0f66b2..0000000 Binary files a/src/main/resources/assets/gadomancy/textures/misc/Cooldown1.png and /dev/null differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Fam_Damage.png b/src/main/resources/assets/gadomancy/textures/misc/Fam_Damage.png new file mode 100644 index 0000000..e4e71a9 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Fam_Damage.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Fam_Enervation.png b/src/main/resources/assets/gadomancy/textures/misc/Fam_Enervation.png new file mode 100644 index 0000000..4e5e402 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Fam_Enervation.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Fam_Fire.png b/src/main/resources/assets/gadomancy/textures/misc/Fam_Fire.png new file mode 100644 index 0000000..3344cd6 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Fam_Fire.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Fam_Lightning.png b/src/main/resources/assets/gadomancy/textures/misc/Fam_Lightning.png new file mode 100644 index 0000000..47239aa Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Fam_Lightning.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Fam_Poison.png b/src/main/resources/assets/gadomancy/textures/misc/Fam_Poison.png new file mode 100644 index 0000000..89f111c Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Fam_Poison.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Fam_Range.png b/src/main/resources/assets/gadomancy/textures/misc/Fam_Range.png new file mode 100644 index 0000000..38c2ffd Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/misc/Fam_Range.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Attack1.png b/src/main/resources/assets/gadomancy/textures/misc/Fam_Speed.png similarity index 73% rename from src/main/resources/assets/gadomancy/textures/misc/Attack1.png rename to src/main/resources/assets/gadomancy/textures/misc/Fam_Speed.png index ffa5b0c..1fe5195 100644 Binary files a/src/main/resources/assets/gadomancy/textures/misc/Attack1.png and b/src/main/resources/assets/gadomancy/textures/misc/Fam_Speed.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/Range1.png b/src/main/resources/assets/gadomancy/textures/misc/Range1.png deleted file mode 100644 index 93c8a5e..0000000 Binary files a/src/main/resources/assets/gadomancy/textures/misc/Range1.png and /dev/null differ