diff --git a/changelog.txt b/changelog.txt index 45759497..8118a4c0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,8 @@ Version 2.0.0-4 - Added T5 orb recipe and Demonic Activation Crystal - Added Rituals: - Animal Growth ritual + - Harvest ritual + - Magnetism ritual - Added parts for the new Soul System - Added the Monster Soul @@ -16,8 +18,11 @@ Version 2.0.0-4 - SSSSSSSSoooooooouuuuuuulllllllllsssssss - Added Soul Forge block - Added soul snare and recipe - has 10% chance for monster to drop its soul + - Added bow + - Added Sentient Armour - Fixed binding of togglable sigils +- Added saving for ritual tags ------------------------------------------------------ Version 2.0.0-3 diff --git a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java index a6a7e20b..17eef2c2 100644 --- a/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java +++ b/src/main/java/WayofTime/bloodmagic/api/ritual/AreaDescriptor.java @@ -65,9 +65,9 @@ public abstract class AreaDescriptor { ArrayList posList = new ArrayList(); - for (int i = minimumOffset.getX(); i < maximumOffset.getX(); i++) + for (int j = minimumOffset.getY(); j < maximumOffset.getY(); j++) { - for (int j = minimumOffset.getY(); j < maximumOffset.getY(); j++) + for (int i = minimumOffset.getX(); i < maximumOffset.getX(); i++) { for (int k = minimumOffset.getZ(); k < maximumOffset.getZ(); k++) { diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java index 9ac60aa7..fe691de3 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRituals.java @@ -24,6 +24,7 @@ public class ModRituals public static Ritual regenerationRitual; public static Ritual animalGrowthRitual; public static Ritual harvestRitual; + public static Ritual magneticRitual; public static ImperfectRitual imperfectNight; public static ImperfectRitual imperfectRain; @@ -51,6 +52,8 @@ public class ModRituals harvestRitual = new RitualHarvest(); RitualRegistry.registerRitual(harvestRitual, harvestRitual.getName()); initHarvestHandlers(); + magneticRitual = new RitualMagnetic(); + RitualRegistry.registerRitual(magneticRitual, magneticRitual.getName()); } public static void initImperfectRituals() diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 07943271..512f1ae2 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -263,6 +263,7 @@ ritual.BloodMagic.wellOfSufferingRitual=Well of Suffering ritual.BloodMagic.featheredKnifeRitual=Ritual of the Feathered Knife ritual.BloodMagic.regenerationRitual=Ritual of Regeneration ritual.BloodMagic.harvestRitual=Reap of the Harvest Moon +ritual.BloodMagic.magneticRitual=Ritual of Magnetism # Chat chat.BloodMagic.altarMaker.setTier=Set Tier to: %d