Merge pull request #20 from Sefiraat/dev

Bug fixes
Sefiraat · Nov 10, 2021 · 64f5589 · 64f5589
2 parents ed6cda2 + 711576a
commit 64f5589
Show file tree

Hide file tree

Showing 6 changed files with 175 additions and 120 deletions.
diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java b/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java
@@ -146,8 +146,11 @@ public void enable() {
         this.spellMemory = new SpellMemory();
         this.effectManager = new EffectManager(this);
 
+        configManager.loadConfig();
+
+        SpellType.setupEnabledSpells();
+
         setupSlimefun();
-        configManager.setupConfigs();
 
         setupBstats();
 

diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/config/ConfigManager.java b/src/main/java/io/github/sefiraat/crystamaehistoria/config/ConfigManager.java
@@ -3,6 +3,7 @@
 import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria;
 import io.github.sefiraat.crystamaehistoria.magic.SpellType;
 import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell;
+import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.LiquefactionBasinCache;
 import lombok.Getter;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
@@ -56,7 +57,7 @@ public boolean spellEnabled(Spell spell) {
         return spells.getBoolean(spell.getId());
     }
 
-    public void setupConfigs() {
+    public void loadConfig() {
         // Spells
         for (SpellType spellType : SpellType.getCachedValues()) {
             Spell spell = spellType.getSpell();
@@ -69,6 +70,11 @@ public void setupConfigs() {
                     exception.printStackTrace();
                 }
             }
+            boolean enabled = spells.getBoolean(spell.getId());
+            spell.setEnabled(enabled);
+            if (enabled) {
+                LiquefactionBasinCache.addSpellRecipe(spellType, spell.getRecipe());
+            }
         }
     }
 

diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/SpellType.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/SpellType.java
@@ -155,18 +155,12 @@ public enum SpellType {
     @Getter
     protected static final SpellType[] cachedValues = values();
     @Getter
-    protected static final SpellType[] enabledSpells = Arrays.stream(values())
-        .filter(spellType -> spellType.getSpell().isEnabled())
-        .toArray(SpellType[]::new);
+    protected static SpellType[] enabledSpells;
     @Getter
     private final Spell spell;
 
     @ParametersAreNonnullByDefault
     SpellType(Spell spell) {
-        spell.setEnabled(CrystamaeHistoria.getConfigManager().spellEnabled(spell));
-        if (spell.isEnabled()) {
-            LiquefactionBasinCache.addSpellRecipe(this, spell.getRecipe());
-        }
         this.spell = spell;
     }
 
@@ -196,4 +190,10 @@ public void cast(CastInformation castInformation) {
         this.spell.castSpell(castInformation);
     }
 
+    public static void setupEnabledSpells() {
+        enabledSpells = Arrays.stream(values())
+            .filter(spellType -> spellType.getSpell().isEnabled())
+            .toArray(SpellType[]::new);
+    }
+
 }
diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Chaos.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Chaos.java
@@ -55,7 +55,7 @@ public void cast(CastInformation castInformation) {
             if (location.getBlock().isEmpty()) {
                 final MagicProjectile projectile = SpellUtils.summonMagicProjectile(castInformation, EntityType.SPECTRAL_ARROW, pointLocation, this::onTick);
                 projectile.getProjectile().setGravity(false);
-                projectile.setVelocity(location.getDirection(), 1);
+                projectile.setVelocity(caster.getEyeLocation().getDirection(), 1);
             }
         }
     }

diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/utils/CrystaTag.java b/src/main/java/io/github/sefiraat/crystamaehistoria/utils/CrystaTag.java
@@ -34,11 +34,12 @@ public enum CrystaTag implements Tag<Material> {
     CrystaTag() {
         final String name = this.name().toLowerCase(Locale.ROOT);
         final String fileLocation = "/tags/" + name + ".json";
+        final JsonParser parser = new JsonParser();
 
         try {
             final InputStream stream = CrystamaeHistoria.class.getResourceAsStream(fileLocation);
             final JsonReader reader = new JsonReader(new InputStreamReader(stream));
-            final JsonObject object = (JsonObject) JsonParser.parseReader(reader);
+            final JsonObject object = (JsonObject) parser.parse(reader);
 
             for (JsonElement element : object.get("values").getAsJsonArray()) {
                 final String tagString = element.getAsString();