diff --git a/src/main/resources/assets/bloodmagic/gui/WritingTable.png b/src/main/resources/assets/bloodmagic/gui/WritingTable.png index 18623f3e..9a873fc2 100644 Binary files a/src/main/resources/assets/bloodmagic/gui/WritingTable.png and b/src/main/resources/assets/bloodmagic/gui/WritingTable.png differ diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 1b82cc3b..afbafaf7 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -129,6 +129,8 @@ tile.BloodMagic.rune.capacity.name=Rune of Capacity tile.BloodMagic.rune.augCapacity.name=Rune of Augmented Capacity tile.BloodMagic.rune.orb.name=Rune of the Orb tile.BloodMagic.rune.acceleration.name=Acceleration Rune +tile.BloodMagic.rune.charging.name=Charging Rune + tile.BloodMagic.ritualStone.blank.name=Ritual Stone tile.BloodMagic.ritualStone.water.name=Ritual Stone of Water diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/MasterRitualStone.png b/src/main/resources/assets/bloodmagic/textures/blocks/MasterRitualStone.png index bd240989..a2776cfe 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/MasterRitualStone.png and b/src/main/resources/assets/bloodmagic/textures/blocks/MasterRitualStone.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/MasterStone.png b/src/main/resources/assets/bloodmagic/textures/blocks/MasterStone.png deleted file mode 100644 index a2776cfe..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/MasterStone.png and /dev/null differ diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/PhantomBlock.png b/src/main/resources/assets/bloodmagic/textures/blocks/PhantomBlock.png index fa7709b0..81c4f64c 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/PhantomBlock.png and b/src/main/resources/assets/bloodmagic/textures/blocks/PhantomBlock.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/blocks/SpectralBlock.png b/src/main/resources/assets/bloodmagic/textures/blocks/SpectralBlock.png index 81c4f64c..fa7709b0 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/blocks/SpectralBlock.png and b/src/main/resources/assets/bloodmagic/textures/blocks/SpectralBlock.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/energyBlastProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/energyBlastProjectile.png index 91b4a55d..a2e8c7f7 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/energyBlastProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/energyBlastProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/explosionProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/explosionProjectile.png index 24b7a2f4..94323bc4 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/explosionProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/explosionProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/fireProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/fireProjectile.png index 5a6d4f2a..ca9d61e0 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/fireProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/fireProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/holyProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/holyProjectile.png index 35a03e3d..52fb9ad3 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/holyProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/holyProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/iceProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/iceProjectile.png index 9eab38e0..5a09b07a 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/iceProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/iceProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/lightningProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/lightningProjectile.png index e68e7880..1ede4513 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/lightningProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/lightningProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/mudProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/mudProjectile.png index 5c8189f5..097cd22b 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/mudProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/mudProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/waterProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/waterProjectile.png index 42f35c42..3950a85a 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/waterProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/waterProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/entities/windGustProjectile.png b/src/main/resources/assets/bloodmagic/textures/entities/windGustProjectile.png index 9bf829d9..fab71f51 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/entities/windGustProjectile.png and b/src/main/resources/assets/bloodmagic/textures/entities/windGustProjectile.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png b/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png index 7de227b3..7be6c0e3 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png and b/src/main/resources/assets/bloodmagic/textures/gui/teleposer.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/AltarMaker.png b/src/main/resources/assets/bloodmagic/textures/items/AltarMaker.png index 431492cc..5e383522 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/AltarMaker.png and b/src/main/resources/assets/bloodmagic/textures/items/AltarMaker.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ArcaneAshes.png b/src/main/resources/assets/bloodmagic/textures/items/ArcaneAshes.png index 3ac9e708..43025e28 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ArcaneAshes.png and b/src/main/resources/assets/bloodmagic/textures/items/ArcaneAshes.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_activated.png b/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_activated.png index b84352dd..3ab8b9f6 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_activated.png and b/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_activated.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_deactivated.png index 026013d8..dee96edf 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_deactivated.png and b/src/main/resources/assets/bloodmagic/textures/items/ElementalSigil_deactivated.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/Item_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/Item_deactivated.png index 59504032..d085eddd 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/Item_deactivated.png and b/src/main/resources/assets/bloodmagic/textures/items/Item_deactivated.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/MonsterSoul.png b/src/main/resources/assets/bloodmagic/textures/items/MonsterSoul.png new file mode 100644 index 00000000..36912991 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/MonsterSoul.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentAffinity.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentAffinity.png index e078a01b..4ad926ee 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentAffinity.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentAffinity.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentAir.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentAir.png index 9bf829d9..c4213d4e 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentAir.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentAir.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentBinding.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentBinding.png index e5829ea3..30273557 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentBinding.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentBinding.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentBloodLight.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentBloodLight.png new file mode 100644 index 00000000..b1801cc5 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentBloodLight.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentBridge.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentBridge.png new file mode 100644 index 00000000..17df28c6 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentBridge.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentCompression.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentCompression.png new file mode 100644 index 00000000..7b183305 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentCompression.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentFastMiner.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentFastMiner.png index 21dbc74a..5808d389 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentFastMiner.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentFastMiner.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentGrowth.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentGrowth.png index 81e1154a..ec1b8f74 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentGrowth.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentGrowth.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentHaste.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentHaste.png new file mode 100644 index 00000000..f6530434 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentHaste.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentLava.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentLava.png index 6bd023dc..9dbc6600 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentLava.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentLava.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentMagnetism.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentMagnetism.png new file mode 100644 index 00000000..9bb11b72 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentMagnetism.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentSeverance.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentSeverance.png new file mode 100644 index 00000000..ccf83f68 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentSeverance.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentSight.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentSight.png index 1422bd5b..8e1cab2a 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentSight.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentSight.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentSuppression.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentSuppression.png index 24fc1af4..5cf01d09 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentSuppression.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentSuppression.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentVoid.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentVoid.png index e4768e22..4f090836 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentVoid.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentVoid.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentWater.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentWater.png index 24f96281..7343b4b0 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/ReagentWater.png and b/src/main/resources/assets/bloodmagic/textures/items/ReagentWater.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/ReagentWind.png b/src/main/resources/assets/bloodmagic/textures/items/ReagentWind.png new file mode 100644 index 00000000..74863eb3 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/ReagentWind.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png b/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png index 5cd6ffe7..ff99c09a 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png and b/src/main/resources/assets/bloodmagic/textures/items/SeerSigil.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_activated.png b/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_activated.png index 2fd2c280..cbc1dbd1 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_activated.png and b/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_activated.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_deactivated.png b/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_deactivated.png index eca7a612..d54bdcf2 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_deactivated.png and b/src/main/resources/assets/bloodmagic/textures/items/SigilOfMagnetism_deactivated.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/VoidSigil.png b/src/main/resources/assets/bloodmagic/textures/items/VoidSigil.png index 110be0e9..c25365e6 100644 Binary files a/src/main/resources/assets/bloodmagic/textures/items/VoidSigil.png and b/src/main/resources/assets/bloodmagic/textures/items/VoidSigil.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/models/baseItemToolCore.png b/src/main/resources/assets/bloodmagic/textures/models/baseItemToolCore.png deleted file mode 100644 index 3c171d98..00000000 Binary files a/src/main/resources/assets/bloodmagic/textures/models/baseItemToolCore.png and /dev/null differ