From 9442179a3d167bffcac014336f883a5b4d9314e8 Mon Sep 17 00:00:00 2001 From: Sefiraat Date: Thu, 4 Nov 2021 16:02:18 +0000 Subject: [PATCH] Gadgets and Mechanisms (#11) --- .../crystamaehistoria/CrystamaeHistoria.java | 10 +- .../listeners/CrystalBreakListener.java | 4 +- .../listeners/MaintenanceListener.java | 2 +- .../crystamaehistoria/magic/SpellType.java | 5 +- .../magic/spells/core/Spell.java | 2 +- .../magic/spells/tier1/AirNova.java | 2 +- .../magic/spells/tier1/AirSprite.java | 2 +- .../magic/spells/tier1/AncientDefence.java | 2 +- .../magic/spells/tier1/Animaniacs.java | 2 +- .../magic/spells/tier1/AntiPrism.java | 2 +- .../magic/spells/tier1/BatteringRam.java | 2 +- .../magic/spells/tier1/BloodMagics.java | 2 +- .../magic/spells/tier1/Bobulate.java | 2 +- .../magic/spells/tier1/Break.java | 2 +- .../magic/spells/tier1/Bright.java | 2 +- .../magic/spells/tier1/CallLightning.java | 2 +- .../magic/spells/tier1/Cascada.java | 2 +- .../magic/spells/tier1/Chaos.java | 2 +- .../magic/spells/tier1/Compass.java | 2 +- .../spells/tier1/CurificationRitual.java | 2 +- .../magic/spells/tier1/Deity.java | 2 +- .../magic/spells/tier1/EarthNova.java | 2 +- .../magic/spells/tier1/EndermansVeil.java | 2 +- .../magic/spells/tier1/EtherealFlow.java | 2 +- .../magic/spells/tier1/FanOfArrows.java | 2 +- .../magic/spells/tier1/FireNova.java | 2 +- .../magic/spells/tier1/Fireball.java | 2 +- .../magic/spells/tier1/FlameSprite.java | 2 +- .../magic/spells/tier1/FrostNova.java | 2 +- .../magic/spells/tier1/Gravity.java | 2 +- .../magic/spells/tier1/Gyroscopic.java | 2 +- .../magic/spells/tier1/HarmonysSonata.java | 2 +- .../magic/spells/tier1/HarvestMoon.java | 2 +- .../magic/spells/tier1/Heal.java | 2 +- .../magic/spells/tier1/HealingMist.java | 2 +- .../magic/spells/tier1/Hearthstone.java | 2 +- .../magic/spells/tier1/Hellscape.java | 2 +- .../magic/spells/tier1/HolyCow.java | 2 +- .../magic/spells/tier1/ImbueVoid.java | 2 +- .../magic/spells/tier1/KnowledgeShare.java | 2 +- .../magic/spells/tier1/LavaLake.java | 2 +- .../magic/spells/tier1/LeechBomb.java | 2 +- .../magic/spells/tier1/LovePotion.java | 2 +- .../magic/spells/tier1/Oviparous.java | 2 +- .../magic/spells/tier1/PhantomsFlight.java | 2 +- .../magic/spells/tier1/PhilosophersStone.java | 2 +- .../magic/spells/tier1/PoisonNova.java | 2 +- .../magic/spells/tier1/Prism.java | 2 +- .../magic/spells/tier1/Protectorate.java | 2 +- .../magic/spells/tier1/Push.java | 2 +- .../magic/spells/tier1/Quake.java | 2 +- .../magic/spells/tier1/RainOfFire.java | 2 +- .../magic/spells/tier1/Ravage.java | 2 +- .../magic/spells/tier1/RemnantOfWar.java | 2 +- .../magic/spells/tier1/Shroud.java | 2 +- .../magic/spells/tier1/SpawnFiends.java | 2 +- .../magic/spells/tier1/Squall.java | 2 +- .../magic/spells/tier1/StarFall.java | 2 +- .../magic/spells/tier1/StripMine.java | 2 +- .../magic/spells/tier1/SummonGolem.java | 2 +- .../magic/spells/tier1/Teleport.java | 2 +- .../magic/spells/tier1/Tempest.java | 2 +- .../magic/spells/tier1/TimeCompression.java | 2 +- .../magic/spells/tier1/TimeDilation.java | 2 +- .../magic/spells/tier1/Tracer.java | 2 +- .../magic/spells/tier1/TunnelBore.java | 2 +- .../magic/spells/tier1/Vacuum.java | 2 +- .../magic/spells/tier1/WitherWeather.java | 2 +- .../slimefun/ItemGroups.java | 2 +- .../crystamaehistoria/slimefun/Machines.java | 128 ----- .../crystamaehistoria/slimefun/Materials.java | 311 ++++++++++- .../slimefun/Mechanisms.java | 515 ++++++++++++++++++ .../crystamaehistoria/slimefun/Tools.java | 59 +- .../AbstractCache.java | 2 +- .../DisplayStandHolder.java | 2 +- .../chroniclerpanel/ChroniclerPanel.java | 7 +- .../chroniclerpanel/ChroniclerPanelCache.java | 4 +- .../slimefun/mechanisms/gadgets/MobFan.java | 180 ++++++ .../slimefun/mechanisms/gadgets/MobLamp.java | 75 +++ .../DummyLiquefactionBasinCrafting.java | 2 +- .../DummyLiquefactionBasinSpell.java | 2 +- .../liquefactionbasin/LiquefactionBasin.java | 14 +- .../LiquefactionBasinCache.java | 14 +- .../liquefactionbasin/RecipeItem.java | 2 +- .../liquefactionbasin/RecipeSpell.java | 2 +- .../DummyRealisationAltar.java | 2 +- .../realisationaltar/RealisationAltar.java | 9 +- .../RealisationAltarCache.java | 4 +- .../staveconfigurator/StaveConfigurator.java | 2 +- .../slimefun/tools/RefactingLens.java | 19 + .../slimefun/tools/plates/ChargedPlate.java | 2 +- .../utils/theme/GuiElements.java | 9 + 92 files changed, 1245 insertions(+), 272 deletions(-) delete mode 100644 src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Machines.java create mode 100644 src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Mechanisms.java rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/AbstractCache.java (94%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/DisplayStandHolder.java (96%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/chroniclerpanel/ChroniclerPanel.java (94%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/chroniclerpanel/ChroniclerPanelCache.java (98%) create mode 100644 src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobFan.java create mode 100644 src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobLamp.java rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/liquefactionbasin/DummyLiquefactionBasinCrafting.java (92%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/liquefactionbasin/DummyLiquefactionBasinSpell.java (91%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/liquefactionbasin/LiquefactionBasin.java (93%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/liquefactionbasin/LiquefactionBasinCache.java (97%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/liquefactionbasin/RecipeItem.java (96%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/liquefactionbasin/RecipeSpell.java (89%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/realisationaltar/DummyRealisationAltar.java (92%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/realisationaltar/RealisationAltar.java (92%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/realisationaltar/RealisationAltarCache.java (98%) rename src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/{machines => mechanisms}/staveconfigurator/StaveConfigurator.java (99%) create mode 100644 src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/RefactingLens.java diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java b/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java index 0aefc4e1..5a070942 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/CrystamaeHistoria.java @@ -11,7 +11,7 @@ import io.github.sefiraat.crystamaehistoria.runnables.RunnableManager; import io.github.sefiraat.crystamaehistoria.runnables.spells.SpellTickRunnable; import io.github.sefiraat.crystamaehistoria.slimefun.ItemGroups; -import io.github.sefiraat.crystamaehistoria.slimefun.Machines; +import io.github.sefiraat.crystamaehistoria.slimefun.Mechanisms; import io.github.sefiraat.crystamaehistoria.slimefun.Materials; import io.github.sefiraat.crystamaehistoria.slimefun.Tools; import io.github.sefiraat.crystamaehistoria.stories.StoriesManager; @@ -141,10 +141,10 @@ protected void disable() { } private void setupSlimefun() { - new ItemGroups(); - new Materials(); - new Machines(); - new Tools(); + ItemGroups.setup(); + Materials.setup(); + Mechanisms.setup(); + Tools.setup(); } } diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/CrystalBreakListener.java b/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/CrystalBreakListener.java index 5537fd90..733c228b 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/CrystalBreakListener.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/CrystalBreakListener.java @@ -1,8 +1,8 @@ package io.github.sefiraat.crystamaehistoria.listeners; import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.realisationaltar.RealisationAltar; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.realisationaltar.RealisationAltarCache; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.realisationaltar.RealisationAltar; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.realisationaltar.RealisationAltarCache; import io.github.sefiraat.crystamaehistoria.stories.Story; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryRarity; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryShardProfile; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/MaintenanceListener.java b/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/MaintenanceListener.java index b2645c35..327a5623 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/MaintenanceListener.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/listeners/MaintenanceListener.java @@ -1,6 +1,6 @@ package io.github.sefiraat.crystamaehistoria.listeners; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.LiquefactionBasin; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.LiquefactionBasin; import me.mrCookieSlime.Slimefun.api.BlockStorage; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/SpellType.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/SpellType.java index 97f983b5..ac100957 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/SpellType.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/SpellType.java @@ -29,13 +29,11 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Fireball; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.FlameSprite; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.FrostNova; -import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Gravity; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Gyroscopic; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.HarmonysSonata; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.HarvestMoon; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Heal; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.HealingMist; -import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Hearthstone; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Hellscape; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.HolyCow; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.ImbueVoid; @@ -44,7 +42,6 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.LeechBomb; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.LovePotion; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Oviparous; -import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.PhantomsFlight; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.PhilosophersStone; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.PoisonNova; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Prism; @@ -68,7 +65,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.TunnelBore; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.Vacuum; import io.github.sefiraat.crystamaehistoria.magic.spells.tier1.WitherWeather; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.LiquefactionBasinCache; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.LiquefactionBasinCache; import lombok.Getter; import javax.annotation.Nonnull; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/core/Spell.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/core/Spell.java index 95ba8cc9..054a1dd2 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/core/Spell.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/core/Spell.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.runnables.spells.SpellTickRunnable; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.utils.theme.ThemeType; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; import io.github.thebusybiscuit.slimefun4.libraries.dough.collections.Pair; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirNova.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirNova.java index b1c6c1d1..cb9fbd98 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirNova.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirNova.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirSprite.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirSprite.java index 90316051..6c3ba108 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirSprite.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AirSprite.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AncientDefence.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AncientDefence.java index 28d6d052..3f739697 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AncientDefence.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AncientDefence.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.thebusybiscuit.slimefun4.libraries.dough.protection.Interaction; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Animaniacs.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Animaniacs.java index b3652b0a..0aa8ba05 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Animaniacs.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Animaniacs.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AntiPrism.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AntiPrism.java index 1d7df952..fd62c7ed 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AntiPrism.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/AntiPrism.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.Keys; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BatteringRam.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BatteringRam.java index 89732116..6262c2ea 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BatteringRam.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BatteringRam.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; import io.github.sefiraat.crystamaehistoria.utils.mobgoals.BatteringRamGoal; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BloodMagics.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BloodMagics.java index 5a8b1a05..e67b7264 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BloodMagics.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/BloodMagics.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bobulate.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bobulate.java index 539fd3c5..ce148802 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bobulate.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bobulate.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.CrystaTag; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Break.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Break.java index eb1353cd..4ad21b30 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Break.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Break.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import org.bukkit.Material; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bright.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bright.java index 7fba5486..aa1e7280 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bright.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Bright.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CallLightning.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CallLightning.java index ac754037..897e9591 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CallLightning.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CallLightning.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Cascada.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Cascada.java index e17a253e..f9572497 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Cascada.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Cascada.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; 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 index 5a0ec801..f065b77c 100644 --- 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 @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Compass.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Compass.java index 218d304a..ce63a2de 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Compass.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Compass.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Color; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CurificationRitual.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CurificationRitual.java index 7ac3fe05..51281c89 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CurificationRitual.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/CurificationRitual.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Deity.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Deity.java index 9c9aaaf3..cbd03ba9 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Deity.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Deity.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; import io.github.sefiraat.crystamaehistoria.utils.mobgoals.DeityGoal; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EarthNova.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EarthNova.java index 964025be..5906d440 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EarthNova.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EarthNova.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EndermansVeil.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EndermansVeil.java index b63d9b8b..5e8b5386 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EndermansVeil.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EndermansVeil.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EtherealFlow.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EtherealFlow.java index 294e5313..dd500d95 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EtherealFlow.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/EtherealFlow.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import org.bukkit.Effect; import org.bukkit.Location; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FanOfArrows.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FanOfArrows.java index 24fa6747..91af0ca9 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FanOfArrows.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FanOfArrows.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FireNova.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FireNova.java index ea0eb8a1..4ab28e22 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FireNova.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FireNova.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Fireball.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Fireball.java index 5c39142c..344af2e0 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Fireball.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Fireball.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FlameSprite.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FlameSprite.java index 7cfce502..4bbf4ac4 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FlameSprite.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FlameSprite.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FrostNova.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FrostNova.java index 3a60f55e..a80bdb18 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FrostNova.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/FrostNova.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gravity.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gravity.java index d1432b61..09810c13 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gravity.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gravity.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Material; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gyroscopic.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gyroscopic.java index af7c6276..f3eb98f8 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gyroscopic.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Gyroscopic.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarmonysSonata.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarmonysSonata.java index 05d5a2dd..c5d5c772 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarmonysSonata.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarmonysSonata.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarvestMoon.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarvestMoon.java index 36f8bdd6..f18e1a14 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarvestMoon.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HarvestMoon.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Location; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Heal.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Heal.java index 5f531517..3f61c7c3 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Heal.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Heal.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HealingMist.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HealingMist.java index 51781a09..49229e8b 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HealingMist.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HealingMist.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Location; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hearthstone.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hearthstone.java index 6e86ee34..576d6263 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hearthstone.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hearthstone.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hellscape.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hellscape.java index 44126a2c..1e029f75 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hellscape.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Hellscape.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HolyCow.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HolyCow.java index 841c1333..db7991db 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HolyCow.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/HolyCow.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/ImbueVoid.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/ImbueVoid.java index eb0ad3e4..08648347 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/ImbueVoid.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/ImbueVoid.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; import io.github.sefiraat.crystamaehistoria.utils.mobgoals.BoringGoal; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/KnowledgeShare.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/KnowledgeShare.java index ab4da1a5..451ec017 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/KnowledgeShare.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/KnowledgeShare.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import org.bukkit.Bukkit; import org.bukkit.Effect; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LavaLake.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LavaLake.java index 3e8f869b..dfe0c4ba 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LavaLake.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LavaLake.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.thebusybiscuit.slimefun4.libraries.dough.protection.Interaction; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LeechBomb.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LeechBomb.java index e3b78512..934e1523 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LeechBomb.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LeechBomb.java @@ -5,7 +5,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LovePotion.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LovePotion.java index 89b52c71..5b3f777d 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LovePotion.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/LovePotion.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Location; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Oviparous.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Oviparous.java index 8af75134..a5a2b271 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Oviparous.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Oviparous.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Color; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhantomsFlight.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhantomsFlight.java index 7aebf4ad..ad8daa07 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhantomsFlight.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhantomsFlight.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhilosophersStone.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhilosophersStone.java index 47d1f915..6791d8c9 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhilosophersStone.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PhilosophersStone.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.CrystaTag; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PoisonNova.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PoisonNova.java index 51cf5cec..13227fee 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PoisonNova.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/PoisonNova.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Prism.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Prism.java index 0714a830..bca58132 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Prism.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Prism.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.Keys; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Protectorate.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Protectorate.java index 71669da9..a5c264da 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Protectorate.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Protectorate.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.Keys; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Push.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Push.java index 2939b9ce..49531e22 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Push.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Push.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Quake.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Quake.java index cf0a75a6..bd784946 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Quake.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Quake.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import org.bukkit.Color; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RainOfFire.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RainOfFire.java index 26df2742..729a4046 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RainOfFire.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RainOfFire.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Ravage.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Ravage.java index 804fd853..f2f57176 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Ravage.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Ravage.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RemnantOfWar.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RemnantOfWar.java index 83110dac..17839503 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RemnantOfWar.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/RemnantOfWar.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Shroud.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Shroud.java index 41339f27..6065d5bb 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Shroud.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Shroud.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Location; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SpawnFiends.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SpawnFiends.java index c55d7c75..83f622bf 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SpawnFiends.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SpawnFiends.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; import io.github.sefiraat.crystamaehistoria.utils.mobgoals.FiendGoal; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Squall.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Squall.java index 3baca9ea..4a68c060 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Squall.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Squall.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StarFall.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StarFall.java index d3b65a30..0bdc7730 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StarFall.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StarFall.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicProjectile; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StripMine.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StripMine.java index e1f33ebc..16e2e68b 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StripMine.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/StripMine.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import org.bukkit.Material; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SummonGolem.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SummonGolem.java index 23a97ccd..a4fa22a1 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SummonGolem.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/SummonGolem.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.MagicSummon; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import io.github.sefiraat.crystamaehistoria.utils.SpellUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Teleport.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Teleport.java index 97d460ef..52110666 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Teleport.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Teleport.java @@ -4,7 +4,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tempest.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tempest.java index dc6a9b56..d086339a 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tempest.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tempest.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import org.bukkit.Location; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeCompression.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeCompression.java index 71278cc6..e260539f 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeCompression.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeCompression.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Color; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeDilation.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeDilation.java index a9b1a8fb..b1948de1 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeDilation.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TimeDilation.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.bukkit.Color; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tracer.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tracer.java index 743edec2..6408dc50 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tracer.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Tracer.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; import org.apache.commons.lang.Validate; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TunnelBore.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TunnelBore.java index 71e284ab..a3a25e05 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TunnelBore.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/TunnelBore.java @@ -5,7 +5,7 @@ import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; import io.github.sefiraat.crystamaehistoria.runnables.spells.TunnelBoreRunnable; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Vacuum.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Vacuum.java index f80b719a..2965a525 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Vacuum.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/Vacuum.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; import io.github.sefiraat.crystamaehistoria.utils.ParticleUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/WitherWeather.java b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/WitherWeather.java index 87a6dc42..728bcea1 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/WitherWeather.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/magic/spells/tier1/WitherWeather.java @@ -3,7 +3,7 @@ import io.github.sefiraat.crystamaehistoria.magic.CastInformation; import io.github.sefiraat.crystamaehistoria.magic.spells.core.Spell; import io.github.sefiraat.crystamaehistoria.magic.spells.core.SpellCoreBuilder; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeSpell; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeSpell; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.Keys; import io.github.thebusybiscuit.slimefun4.libraries.dough.data.persistent.PersistentDataAPI; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/ItemGroups.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/ItemGroups.java index 4e89b7ac..eef854d8 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/ItemGroups.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/ItemGroups.java @@ -82,7 +82,7 @@ public final class ItemGroups { ) ); - public ItemGroups() { + public static void setup() { final CrystamaeHistoria plugin = CrystamaeHistoria.getInstance(); // Slimefun Registry diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Machines.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Machines.java deleted file mode 100644 index ab398adf..00000000 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Machines.java +++ /dev/null @@ -1,128 +0,0 @@ -package io.github.sefiraat.crystamaehistoria.slimefun; - -import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.chroniclerpanel.ChroniclerPanel; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.DummyLiquefactionBasinCrafting; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.LiquefactionBasin; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.LiquefactionBasinCache; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeItem; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.realisationaltar.RealisationAltar; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.staveconfigurator.StaveConfigurator; -import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; -import io.github.sefiraat.crystamaehistoria.utils.theme.ThemeType; -import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; -import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; -import org.bukkit.Material; -import org.bukkit.inventory.ItemStack; - -public class Machines { - - public static ChroniclerPanel CHRONICLER_PANEL; - public static RealisationAltar REALISATION_ALTAR; - public static LiquefactionBasin LIQUEFACTION_BASIN; - public static StaveConfigurator STAVE_CONFIGURATOR; - - public Machines() { - - final CrystamaeHistoria plugin = CrystamaeHistoria.getInstance(); - - // Chronicler - CHRONICLER_PANEL = new ChroniclerPanel( - ItemGroups.MECHANISMS, - ThemeType.themedSlimefunItemStack( - "CRY_CHRONICLER_PANEL_1", - new ItemStack(Material.DEEPSLATE_TILE_SLAB), - ThemeType.MECHANISM, - "Chronicler Panel", - "The chronicler panel will draw out", - "the stories contained within a given", - "block over time." - ), - RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[]{ - new ItemStack(Material.DEEPSLATE_BRICKS), new ItemStack(Material.DEEPSLATE_BRICKS), new ItemStack(Material.DEEPSLATE_BRICKS), - SlimefunItems.CORINTHIAN_BRONZE_INGOT, new ItemStack(Material.AMETHYST_CLUSTER), SlimefunItems.CORINTHIAN_BRONZE_INGOT, - SlimefunItems.MAGIC_LUMP_2, SlimefunItems.MAGIC_LUMP_2, SlimefunItems.MAGIC_LUMP_2, - } - ); - - // Realisation - REALISATION_ALTAR = new RealisationAltar( - ItemGroups.MECHANISMS, - ThemeType.themedSlimefunItemStack( - "CRY_REALISATION_ALTAR_1", - new ItemStack(Material.CHISELED_DEEPSLATE), - ThemeType.MECHANISM, - "Realisation Altar", - "The realisation altar takes storied", - "blocks and converts their stories into", - "a physical form." - ), - RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[]{ - null, new ItemStack(Material.BOOK), null, - SlimefunItems.CORINTHIAN_BRONZE_INGOT, new ItemStack(Material.AMETHYST_CLUSTER), SlimefunItems.CORINTHIAN_BRONZE_INGOT, - SlimefunItems.MAGIC_LUMP_2, SlimefunItems.TALISMAN_MAGICIAN, SlimefunItems.MAGIC_LUMP_2, - } - ); - - // Liquefaction - LIQUEFACTION_BASIN = new LiquefactionBasin( - ItemGroups.MECHANISMS, - ThemeType.themedSlimefunItemStack( - "CRY_LIQUEFACTION_BASIN_1", - new ItemStack(Material.CAULDRON), - ThemeType.MECHANISM, - "Liquefaction Basin", - "The liquefaction basin can take", - "Crystals and convert them into their liquid", - "Crystamae form. Used for magical crafting" - ), - RecipeType.ENHANCED_CRAFTING_TABLE, - new ItemStack[]{ - null, - new ItemStack(Material.BOOK), - null, - SlimefunItems.CORINTHIAN_BRONZE_INGOT, - new ItemStack(Material.AMETHYST_CLUSTER), - SlimefunItems.CORINTHIAN_BRONZE_INGOT, - Materials.AMALGAMATE_INGOT.getItem(), - SlimefunItems.TALISMAN_MAGICIAN, - Materials.AMALGAMATE_INGOT.getItem(), - } - ); - - - // Stave Configurator - RecipeItem staveConfiguratorRecipe = new RecipeItem( - new ItemStack(Material.COPPER_BLOCK), - StoryType.ELEMENTAL, 1, - StoryType.MECHANICAL, 1, - StoryType.ALCHEMICAL, 1 - ); - STAVE_CONFIGURATOR = new StaveConfigurator( - ItemGroups.MECHANISMS, - ThemeType.themedSlimefunItemStack( - "CRY_STAVE_CONFIGURATOR", - new ItemStack(Material.CUT_COPPER), - ThemeType.MECHANISM, - "Stave Configurator", - "The Stave Configurator allows you", - "to add spell plates into your", - "Staves." - ), - DummyLiquefactionBasinCrafting.TYPE, - staveConfiguratorRecipe.getDisplayRecipe() - ); - - // Slimefun Registry - CHRONICLER_PANEL.register(plugin); - REALISATION_ALTAR.register(plugin); - LIQUEFACTION_BASIN.register(plugin); - STAVE_CONFIGURATOR.register(plugin); - - // Liquefaction Recipes - LiquefactionBasinCache.addCraftingRecipe(STAVE_CONFIGURATOR, staveConfiguratorRecipe); - } - -} diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Materials.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Materials.java index 3a30557c..2f4a4649 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Materials.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Materials.java @@ -1,9 +1,10 @@ package io.github.sefiraat.crystamaehistoria.slimefun; import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.LiquefactionBasinCache; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin.RecipeItem; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.realisationaltar.DummyRealisationAltar; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.DummyLiquefactionBasinCrafting; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.LiquefactionBasinCache; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeItem; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.realisationaltar.DummyRealisationAltar; import io.github.sefiraat.crystamaehistoria.slimefun.materials.Crystal; import io.github.sefiraat.crystamaehistoria.slimefun.tools.plates.BlankPlate; import io.github.sefiraat.crystamaehistoria.slimefun.tools.plates.ChargedPlate; @@ -15,6 +16,8 @@ import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import io.github.thebusybiscuit.slimefun4.implementation.items.blocks.UnplaceableBlock; +import lombok.Getter; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -26,12 +29,39 @@ public class Materials { public static final Map DUMMY_CRYSTAL_MAP = new EnumMap<>(StoryType.class); public static final Map> CRYSTAL_MAP = new EnumMap<>(StoryRarity.class); - public static SlimefunItem INERT_PLATE_T_1; - public static SlimefunItem CHARGED_PLATE_T_1; - public static SlimefunItem AMALGAMATE_DUST; - public static SlimefunItem AMALGAMATE_INGOT; - public Materials() { + @Getter + private static SlimefunItem inertPlate; + @Getter + private static SlimefunItem chargedPlate; + @Getter + private static SlimefunItem amalgamateDustCommon; + @Getter + private static SlimefunItem amalgamateIngotCommon; + @Getter + private static SlimefunItem amalgamateDustUncommon; + @Getter + private static SlimefunItem amalgamateIngotUncommon; + @Getter + private static SlimefunItem amalgamateDustRare; + @Getter + private static SlimefunItem amalgamateIngotRare; + @Getter + private static SlimefunItem amalgamateDustEpic; + @Getter + private static SlimefunItem amalgamateIngotEpic; + @Getter + private static SlimefunItem amalgamateDustMythical; + @Getter + private static SlimefunItem amalgamateIngotMythical; + @Getter + private static SlimefunItem amalgamateDustUnique; + @Getter + private static SlimefunItem amalgamateIngotUnique; + @Getter + private static SlimefunItem imbuedGlass; + + public static void setup() { CrystamaeHistoria plugin = CrystamaeHistoria.getInstance(); @@ -89,7 +119,7 @@ public Materials() { StoryType.PHILOSOPHICAL, 10 ); - INERT_PLATE_T_1 = new BlankPlate( + inertPlate = new BlankPlate( ItemGroups.TOOLS, ThemeType.themedSlimefunItemStack( "CRY_SPELL_PLATE_1", @@ -106,7 +136,7 @@ public Materials() { // Charged Plate - CHARGED_PLATE_T_1 = new ChargedPlate( + chargedPlate = new ChargedPlate( ItemGroups.TOOLS, ThemeType.themedSlimefunItemStack( "CRY_CHARGED_PLATE_1", @@ -121,14 +151,14 @@ public Materials() { 1 ); - // Amalgamate Dust - AMALGAMATE_DUST = new SlimefunItem( + // Amalgamate Dust Common + amalgamateDustCommon = new SlimefunItem( ItemGroups.TOOLS, ThemeType.themedSlimefunItemStack( - "CRY_AMALGAMATE_DUST", + "CRY_AMALGAMATE_DUST_COMMON", new ItemStack(Material.GLOWSTONE_DUST), ThemeType.CRAFTING, - "Amalgamate Dust", + "Amalgamate Dust (Common)", "A dust combining all magic types." ), RecipeType.MAGIC_WORKBENCH, @@ -145,30 +175,263 @@ public Materials() { } ); - // Amalgamate Ingot - AMALGAMATE_INGOT = new SlimefunItem( + // Amalgamate Dust Uncommon + amalgamateDustUncommon = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_DUST_UNCOMMON", + new ItemStack(Material.GLOWSTONE_DUST), + ThemeType.CRAFTING, + "Amalgamate Dust (Uncommon)", + "A dust combining all magic types." + ), + RecipeType.MAGIC_WORKBENCH, + new ItemStack[]{ + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.ELEMENTAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.MECHANICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.ALCHEMICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.HISTORICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.HUMAN).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.ANIMAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.CELESTIAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.VOID).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNCOMMON).get(StoryType.PHILOSOPHICAL).getItem() + } + ); + + // Amalgamate Dust Rare + amalgamateDustRare = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_DUST_RARE", + new ItemStack(Material.GLOWSTONE_DUST), + ThemeType.CRAFTING, + "Amalgamate Dust (Rare)", + "A dust combining all magic types." + ), + RecipeType.MAGIC_WORKBENCH, + new ItemStack[]{ + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.ELEMENTAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.MECHANICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.ALCHEMICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.HISTORICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.HUMAN).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.ANIMAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.CELESTIAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.VOID).getItem(), + CRYSTAL_MAP.get(StoryRarity.RARE).get(StoryType.PHILOSOPHICAL).getItem() + } + ); + + // Amalgamate Dust Epic + amalgamateDustEpic = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_DUST_EPIC", + new ItemStack(Material.GLOWSTONE_DUST), + ThemeType.CRAFTING, + "Amalgamate Dust (Epic)", + "A dust combining all magic types." + ), + RecipeType.MAGIC_WORKBENCH, + new ItemStack[]{ + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.ELEMENTAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.MECHANICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.ALCHEMICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.HISTORICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.HUMAN).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.ANIMAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.CELESTIAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.VOID).getItem(), + CRYSTAL_MAP.get(StoryRarity.EPIC).get(StoryType.PHILOSOPHICAL).getItem() + } + ); + + // Amalgamate Dust Mythical + amalgamateDustMythical = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_DUST_MYTHICAL", + new ItemStack(Material.GLOWSTONE_DUST), + ThemeType.CRAFTING, + "Amalgamate Dust (Mythical)", + "A dust combining all magic types." + ), + RecipeType.MAGIC_WORKBENCH, + new ItemStack[]{ + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.ELEMENTAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.MECHANICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.ALCHEMICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.HISTORICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.HUMAN).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.ANIMAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.CELESTIAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.VOID).getItem(), + CRYSTAL_MAP.get(StoryRarity.MYTHICAL).get(StoryType.PHILOSOPHICAL).getItem() + } + ); + + // Amalgamate Dust Unique + amalgamateDustUnique = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_DUST_UNIQUE", + new ItemStack(Material.GLOWSTONE_DUST), + ThemeType.CRAFTING, + "Amalgamate Dust (Unique)", + "A dust combining all magic types." + ), + RecipeType.MAGIC_WORKBENCH, + new ItemStack[]{ + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.ELEMENTAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.MECHANICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.ALCHEMICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.HISTORICAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.HUMAN).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.ANIMAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.CELESTIAL).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.VOID).getItem(), + CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.PHILOSOPHICAL).getItem() + } + ); + + // Amalgamate Ingot Common + amalgamateIngotCommon = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_INGOT_COMMON", + new ItemStack(Material.GOLD_INGOT), + ThemeType.CRAFTING, + "Amalgamate Ingot (Common)", + "An ingot crafted of pure magics." + ), + RecipeType.SMELTERY, + new ItemStack[]{ + amalgamateDustCommon.getItem() + } + ); + + // Amalgamate Ingot Uncommon + amalgamateIngotUncommon = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_INGOT_UNCOMMON", + new ItemStack(Material.GOLD_INGOT), + ThemeType.CRAFTING, + "Amalgamate Ingot (Uncommon)", + "An ingot crafted of pure magics." + ), + RecipeType.SMELTERY, + new ItemStack[]{ + amalgamateDustUncommon.getItem() + } + ); + + // Amalgamate Ingot Rare + amalgamateIngotRare = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_INGOT_RARE", + new ItemStack(Material.GOLD_INGOT), + ThemeType.CRAFTING, + "Amalgamate Ingot (Rare)", + "An ingot crafted of pure magics." + ), + RecipeType.SMELTERY, + new ItemStack[]{ + amalgamateDustRare.getItem() + } + ); + + // Amalgamate Ingot Epic + amalgamateIngotEpic = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_INGOT_EPIC", + new ItemStack(Material.GOLD_INGOT), + ThemeType.CRAFTING, + "Amalgamate Ingot (Epic)", + "An ingot crafted of pure magics." + ), + RecipeType.SMELTERY, + new ItemStack[]{ + amalgamateDustEpic.getItem() + } + ); + + // Amalgamate Ingot Mythical + amalgamateIngotMythical = new SlimefunItem( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_AMALGAMATE_INGOT_MYTHICAL", + new ItemStack(Material.GOLD_INGOT), + ThemeType.CRAFTING, + "Amalgamate Ingot (Mythical)", + "An ingot crafted of pure magics." + ), + RecipeType.SMELTERY, + new ItemStack[]{ + amalgamateDustMythical.getItem() + } + ); + + // Amalgamate Ingot Unique + amalgamateIngotUnique = new SlimefunItem( ItemGroups.TOOLS, ThemeType.themedSlimefunItemStack( - "CRY_AMALGAMATE_INGOT", + "CRY_AMALGAMATE_INGOT_UNIQUE", new ItemStack(Material.GOLD_INGOT), ThemeType.CRAFTING, - "Amalgamate Ingot", + "Amalgamate Ingot (Unique)", "An ingot crafted of pure magics." ), RecipeType.SMELTERY, new ItemStack[]{ - AMALGAMATE_DUST.getItem() + amalgamateDustUnique.getItem() } ); + // Imbued Glass + RecipeItem imbuedGlassRecipe = new RecipeItem( + new ItemStack(Material.GLASS_PANE), + StoryType.ELEMENTAL, 10, + StoryType.HUMAN, 10, + StoryType.VOID, 10 + ); + imbuedGlass = new UnplaceableBlock( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_IMBUED_GLASS", + new ItemStack(Material.GLASS_PANE), + ThemeType.CRAFTING, + "Imbued Glass", + "Glass imbued with Crysta that has", + "some strange properties." + ), + DummyLiquefactionBasinCrafting.TYPE, + imbuedGlassRecipe.getDisplayRecipe() + ); + // Slimefun Registry - CHARGED_PLATE_T_1.register(CrystamaeHistoria.getInstance()); - INERT_PLATE_T_1.register(CrystamaeHistoria.getInstance()); - AMALGAMATE_DUST.register(plugin); - AMALGAMATE_INGOT.register(plugin); + chargedPlate.register(CrystamaeHistoria.getInstance()); + inertPlate.register(CrystamaeHistoria.getInstance()); + amalgamateDustCommon.register(plugin); + amalgamateIngotCommon.register(plugin); + amalgamateDustUncommon.register(plugin); + amalgamateIngotUncommon.register(plugin); + amalgamateDustRare.register(plugin); + amalgamateIngotRare.register(plugin); + amalgamateDustEpic.register(plugin); + amalgamateIngotEpic.register(plugin); + amalgamateDustMythical.register(plugin); + amalgamateIngotMythical.register(plugin); + amalgamateDustUnique.register(plugin); + amalgamateIngotUnique.register(plugin); + imbuedGlass.register(plugin); // Liquefaction Recipes - LiquefactionBasinCache.addCraftingRecipe(INERT_PLATE_T_1, inertRecipeItem); + LiquefactionBasinCache.addCraftingRecipe(inertPlate, inertRecipeItem); + LiquefactionBasinCache.addCraftingRecipe(imbuedGlass, imbuedGlassRecipe); } } diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Mechanisms.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Mechanisms.java new file mode 100644 index 00000000..9ce75325 --- /dev/null +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Mechanisms.java @@ -0,0 +1,515 @@ +package io.github.sefiraat.crystamaehistoria.slimefun; + +import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.chroniclerpanel.ChroniclerPanel; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.gadgets.MobFan; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.gadgets.MobLamp; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.DummyLiquefactionBasinCrafting; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.LiquefactionBasin; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.LiquefactionBasinCache; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin.RecipeItem; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.realisationaltar.RealisationAltar; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.staveconfigurator.StaveConfigurator; +import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; +import io.github.sefiraat.crystamaehistoria.utils.theme.ThemeType; +import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun4.implementation.SlimefunItems; +import lombok.Getter; +import lombok.experimental.UtilityClass; +import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; + +@UtilityClass +public class Mechanisms { + + @Getter + private static ChroniclerPanel chroniclerPanel1; + @Getter + private static ChroniclerPanel chroniclerPanel2; + @Getter + private static ChroniclerPanel chroniclerPanel3; + @Getter + private static ChroniclerPanel chroniclerPanel4; + @Getter + private static RealisationAltar realisationAltar1; + @Getter + private static RealisationAltar realisationAltar2; + @Getter + private static RealisationAltar realisationAltar3; + @Getter + private static RealisationAltar realisationAltar4; + @Getter + private static LiquefactionBasin liquefactionBasin1; + @Getter + private static LiquefactionBasin liquefactionBasin2; + @Getter + private static LiquefactionBasin liquefactionBasin3; + @Getter + private static LiquefactionBasin liquefactionBasin4; + @Getter + private static StaveConfigurator staveConfigurator; + @Getter + private static MobLamp abstractionLamp; + @Getter + private static MobLamp dispersionLamp; + @Getter + private static MobFan inversionVacuum; + @Getter + private static MobFan antipodalVacuum; + + public static void setup() { + + final CrystamaeHistoria plugin = CrystamaeHistoria.getInstance(); + + // Chronicler Tier 1 + chroniclerPanel1 = new ChroniclerPanel( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_CHRONICLER_PANEL_1", + new ItemStack(Material.COBBLED_DEEPSLATE_SLAB), + ThemeType.MECHANISM, + "Chronicler Panel (Tier 1)", + "The chronicler panel will draw out", + "the stories contained within a given", + "block over time.", + "", + "Can chronicle stories for T1-T2 blocks." + ), + RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{ + new ItemStack(Material.COBBLED_DEEPSLATE), new ItemStack(Material.COBBLED_DEEPSLATE), new ItemStack(Material.COBBLED_DEEPSLATE), + SlimefunItems.CORINTHIAN_BRONZE_INGOT, new ItemStack(Material.AMETHYST_CLUSTER), SlimefunItems.CORINTHIAN_BRONZE_INGOT, + SlimefunItems.MAGIC_LUMP_2, SlimefunItems.MAGIC_LUMP_2, SlimefunItems.MAGIC_LUMP_2, + }, + 1 + ); + + // Chronicler Tier 2 + chroniclerPanel2 = new ChroniclerPanel( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_CHRONICLER_PANEL_2", + new ItemStack(Material.DEEPSLATE_TILE_SLAB), + ThemeType.MECHANISM, + "Chronicler Panel (Tier 2)", + "The chronicler panel will draw out", + "the stories contained within a given", + "block over time.", + "", + "Can chronicle stories for T1-T3 blocks." + ), + RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{ + new ItemStack(Material.DEEPSLATE_BRICKS), new ItemStack(Material.DEEPSLATE_BRICKS), new ItemStack(Material.DEEPSLATE_BRICKS), + Materials.getAmalgamateIngotUncommon().getItem(), chroniclerPanel1.getItem(), Materials.getAmalgamateIngotUncommon().getItem(), + SlimefunItems.MAGIC_LUMP_3, SlimefunItems.MAGIC_LUMP_3, SlimefunItems.MAGIC_LUMP_3, + }, + 2 + ); + + // Chronicler Tier 3 + RecipeItem chroniclerT3Recipe = new RecipeItem( + chroniclerPanel2.getItem(), + StoryType.ELEMENTAL, 150, + StoryType.CELESTIAL, 200, + StoryType.VOID, 50 + ); + chroniclerPanel3 = new ChroniclerPanel( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_CHRONICLER_PANEL_3", + new ItemStack(Material.NETHER_BRICK_SLAB), + ThemeType.MECHANISM, + "Chronicler Panel (Tier 3)", + "The chronicler panel will draw out", + "the stories contained within a given", + "block over time.", + "", + "Can chronicle stories for T1-T4 blocks." + ), + DummyLiquefactionBasinCrafting.TYPE, + chroniclerT3Recipe.getDisplayRecipe(), + 3 + ); + + // Chronicler Tier 4 + RecipeItem chroniclerT4Recipe = new RecipeItem( + chroniclerPanel3.getItem(), + StoryType.ELEMENTAL, 1000, + StoryType.CELESTIAL, 850, + StoryType.VOID, 650 + ); + chroniclerPanel4 = new ChroniclerPanel( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_CHRONICLER_PANEL_4", + new ItemStack(Material.DARK_PRISMARINE_SLAB), + ThemeType.MECHANISM, + "Chronicler Panel (Tier 4)", + "The chronicler panel will draw out", + "the stories contained within a given", + "block over time.", + "", + "Can chronicle stories for T1-T5 blocks." + ), + DummyLiquefactionBasinCrafting.TYPE, + chroniclerT4Recipe.getDisplayRecipe(), + 4 + ); + + // Realisation Tier 1 + realisationAltar1 = new RealisationAltar( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_REALISATION_ALTAR_1", + new ItemStack(Material.CHISELED_DEEPSLATE), + ThemeType.MECHANISM, + "Realisation Altar (Tier 1)", + "The realisation altar takes storied", + "blocks and converts their stories into", + "a physical form.", + "", + "Can realise T1 - T2." + ), + RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{ + null, new ItemStack(Material.BOOK), null, + SlimefunItems.CORINTHIAN_BRONZE_INGOT, new ItemStack(Material.AMETHYST_CLUSTER), SlimefunItems.CORINTHIAN_BRONZE_INGOT, + SlimefunItems.MAGIC_LUMP_2, SlimefunItems.COMMON_TALISMAN, SlimefunItems.MAGIC_LUMP_2, + }, + 1 + ); + + // Realisation Tier 2 + realisationAltar2 = new RealisationAltar( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_REALISATION_ALTAR_2", + new ItemStack(Material.CHISELED_NETHER_BRICKS), + ThemeType.MECHANISM, + "Realisation Altar (Tier 2)", + "The realisation altar takes storied", + "blocks and converts their stories into", + "a physical form.", + "", + "Can realise T1 - T3." + ), + RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{ + null, new ItemStack(Material.BOOK), null, + Materials.getAmalgamateIngotUncommon().getItem(), realisationAltar1.getItem(), Materials.getAmalgamateIngotUncommon().getItem(), + SlimefunItems.MAGIC_LUMP_3, SlimefunItems.SOULBOUND_RUNE, SlimefunItems.MAGIC_LUMP_3, + }, + 2 + ); + + // Realisation Tier 3 + RecipeItem realisationT3Recipe = new RecipeItem( + realisationAltar2.getItem(), + StoryType.HISTORICAL, 100, + StoryType.HUMAN, 350, + StoryType.PHILOSOPHICAL, 150 + ); + realisationAltar3 = new RealisationAltar( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_REALISATION_ALTAR_3", + new ItemStack(Material.CHISELED_RED_SANDSTONE), + ThemeType.MECHANISM, + "Realisation Altar (Tier 3)", + "The realisation altar takes storied", + "blocks and converts their stories into", + "a physical form.", + "", + "Can realise T1 - T4." + ), + DummyLiquefactionBasinCrafting.TYPE, + realisationT3Recipe.getDisplayRecipe(), + 3 + ); + + // Realisation Tier 4 + RecipeItem realisationT4Recipe = new RecipeItem( + realisationAltar3.getItem(), + StoryType.HISTORICAL, 1100, + StoryType.HUMAN, 720, + StoryType.PHILOSOPHICAL, 450 + ); + realisationAltar4 = new RealisationAltar( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_REALISATION_ALTAR_4", + new ItemStack(Material.CHISELED_POLISHED_BLACKSTONE), + ThemeType.MECHANISM, + "Realisation Altar (Tier 4)", + "The realisation altar takes storied", + "blocks and converts their stories into", + "a physical form.", + "", + "Can realise T1 - T5." + ), + DummyLiquefactionBasinCrafting.TYPE, + realisationT4Recipe.getDisplayRecipe(), + 4 + ); + + // Liquefaction T1 + liquefactionBasin1 = new LiquefactionBasin( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_LIQUEFACTION_BASIN_1", + new ItemStack(Material.CAULDRON), + ThemeType.MECHANISM, + "Liquefaction Basin (Tier 1)", + "The liquefaction basin can take", + "Crystals and convert them into their liquid", + "Crystamae form. Used for magical crafting", + "", + "Holds up to 500 Liquefied Crysta." + ), + RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{ + SlimefunItems.REINFORCED_ALLOY_INGOT, null, SlimefunItems.REINFORCED_ALLOY_INGOT, + SlimefunItems.REINFORCED_ALLOY_INGOT, new ItemStack(Material.CAULDRON), SlimefunItems.REINFORCED_ALLOY_INGOT, + SlimefunItems.REINFORCED_ALLOY_INGOT, SlimefunItems.COMMON_TALISMAN, SlimefunItems.REINFORCED_ALLOY_INGOT + }, + 500 + ); + + // Liquefaction T2 + liquefactionBasin2 = new LiquefactionBasin( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_LIQUEFACTION_BASIN_2", + new ItemStack(Material.CAULDRON), + ThemeType.MECHANISM, + "Liquefaction Basin (Tier 2)", + "The liquefaction basin can take", + "Crystals and convert them into their liquid", + "Crystamae form. Used for magical crafting", + "", + "Holds up to 1000 Liquefied Crysta." + ), + RecipeType.ENHANCED_CRAFTING_TABLE, + new ItemStack[]{ + Materials.getAmalgamateDustRare().getItem(), null, Materials.getAmalgamateDustRare().getItem(), + Materials.getAmalgamateDustRare().getItem(), liquefactionBasin1.getItem(), Materials.getAmalgamateDustRare().getItem(), + Materials.getAmalgamateDustRare().getItem(), SlimefunItems.ENCHANTMENT_RUNE, Materials.getAmalgamateDustRare().getItem() + }, + 1000 + ); + + // Liquefaction T3 + RecipeItem liquefactionT3Recipe = new RecipeItem( + liquefactionBasin2.getItem(), + StoryType.MECHANICAL, 90, + StoryType.ALCHEMICAL, 250, + StoryType.ANIMAL, 185 + ); + liquefactionBasin3 = new LiquefactionBasin( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_LIQUEFACTION_BASIN_3", + new ItemStack(Material.CAULDRON), + ThemeType.MECHANISM, + "Liquefaction Basin (Tier 3)", + "The liquefaction basin can take", + "Crystals and convert them into their liquid", + "Crystamae form. Used for magical crafting", + "", + "Holds up to 2500 Liquefied Crysta." + ), + DummyLiquefactionBasinCrafting.TYPE, + liquefactionT3Recipe.getDisplayRecipe(), + 2500 + ); + + // Liquefaction T4 + RecipeItem liquefactionT4Recipe = new RecipeItem( + liquefactionBasin3.getItem(), + StoryType.MECHANICAL, 750, + StoryType.ALCHEMICAL, 700, + StoryType.ANIMAL, 600 + ); + liquefactionBasin4 = new LiquefactionBasin( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_LIQUEFACTION_BASIN_4", + new ItemStack(Material.CAULDRON), + ThemeType.MECHANISM, + "Liquefaction Basin (Tier 4)", + "The liquefaction basin can take", + "Crystals and convert them into their liquid", + "Crystamae form. Used for magical crafting", + "", + "Holds up to 5000 Liquefied Crysta." + ), + DummyLiquefactionBasinCrafting.TYPE, + liquefactionT4Recipe.getDisplayRecipe(), + 5000 + ); + + // Stave Configurator + RecipeItem staveConfiguratorRecipe = new RecipeItem( + new ItemStack(Material.COPPER_BLOCK), + StoryType.ELEMENTAL, 300, + StoryType.MECHANICAL, 200, + StoryType.ALCHEMICAL, 510 + ); + staveConfigurator = new StaveConfigurator( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_STAVE_CONFIGURATOR", + new ItemStack(Material.CUT_COPPER), + ThemeType.MECHANISM, + "Stave Configurator", + "The Stave Configurator allows you", + "to add spell plates into your", + "Staves." + ), + DummyLiquefactionBasinCrafting.TYPE, + staveConfiguratorRecipe.getDisplayRecipe() + ); + + // Abstraction Lamp + RecipeItem abstractionLampRecipe = new RecipeItem( + new ItemStack(Material.LANTERN), + StoryType.ALCHEMICAL, 50, + StoryType.HUMAN, 75, + StoryType.PHILOSOPHICAL, 75 + ); + abstractionLamp = new MobLamp( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_MOB_LAMP_1", + new ItemStack(Material.LANTERN), + ThemeType.MECHANISM, + "Abstraction Lamp", + "The abstraction lamp will push all", + "nearby mobs away from it.", + "", + ThemeType.CLICK_INFO.getColor() + "Range: " + ThemeType.PASSIVE.getColor() + "5 Blocks", + ThemeType.CLICK_INFO.getColor() + "Force: " + ThemeType.PASSIVE.getColor() + "3 CrystaPow™" + ), + DummyLiquefactionBasinCrafting.TYPE, + abstractionLampRecipe.getDisplayRecipe(), + 5, + 0.3 + ); + + // Dispersion Lamp + RecipeItem dispersionLampRecipe = new RecipeItem( + abstractionLamp.getItem(), + StoryType.ALCHEMICAL, 250, + StoryType.HUMAN, 150, + StoryType.PHILOSOPHICAL, 300 + ); + dispersionLamp = new MobLamp( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_MOB_LAMP_2", + new ItemStack(Material.SOUL_LANTERN), + ThemeType.MECHANISM, + "Dispersion Lamp", + "The dispersion lamp will push all", + "nearby mobs away from it.", + "", + ThemeType.CLICK_INFO.getColor() + "Range: " + ThemeType.PASSIVE.getColor() + "7 Blocks", + ThemeType.CLICK_INFO.getColor() + "Force: " + ThemeType.PASSIVE.getColor() + "5 CrystaPow™" + ), + DummyLiquefactionBasinCrafting.TYPE, + abstractionLampRecipe.getDisplayRecipe(), + 7, + 0.5 + ); + + // Inversion Vacuum + RecipeItem inversionVacuumRecipe = new RecipeItem( + abstractionLamp.getItem(), + StoryType.HISTORICAL, 200, + StoryType.VOID, 200, + StoryType.PHILOSOPHICAL, 180 + ); + inversionVacuum = new MobFan( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_MOB_FAN_1", + new ItemStack(Material.REDSTONE_LAMP), + ThemeType.MECHANISM, + "Inversion Vacuum", + "Creates a magically induced vacuum", + "that pulls entities away from the", + "mechanism.", + "", + ThemeType.CLICK_INFO.getColor() + "Push Distance: " + ThemeType.PASSIVE.getColor() + "5 Blocks" + ), + DummyLiquefactionBasinCrafting.TYPE, + inversionVacuumRecipe.getDisplayRecipe(), + 5 + ); + + + // Antipodal Vacuum + RecipeItem antipodalVacuumRecipe = new RecipeItem( + dispersionLamp.getItem(), + StoryType.HISTORICAL, 400, + StoryType.VOID, 400, + StoryType.PHILOSOPHICAL, 360 + ); + antipodalVacuum = new MobFan( + ItemGroups.MECHANISMS, + ThemeType.themedSlimefunItemStack( + "CRY_MOB_FAN_2", + new ItemStack(Material.NOTE_BLOCK), + ThemeType.MECHANISM, + "Antipodal Vacuum", + "Creates a magically induced vacuum", + "that pulls entities away from the", + "mechanism.", + "", + ThemeType.CLICK_INFO.getColor() + "Push Distance: " + ThemeType.PASSIVE.getColor() + "10 Blocks" + ), + DummyLiquefactionBasinCrafting.TYPE, + antipodalVacuumRecipe.getDisplayRecipe(), + 10 + ); + + // Slimefun Registry + chroniclerPanel1.register(plugin); + chroniclerPanel2.register(plugin); + chroniclerPanel3.register(plugin); + chroniclerPanel4.register(plugin); + realisationAltar1.register(plugin); + realisationAltar2.register(plugin); + realisationAltar3.register(plugin); + realisationAltar4.register(plugin); + liquefactionBasin1.register(plugin); + liquefactionBasin2.register(plugin); + liquefactionBasin3.register(plugin); + liquefactionBasin4.register(plugin); + staveConfigurator.register(plugin); + abstractionLamp.register(plugin); + dispersionLamp.register(plugin); + inversionVacuum.register(plugin); + antipodalVacuum.register(plugin); + + // Liquefaction Recipes + LiquefactionBasinCache.addCraftingRecipe(chroniclerPanel3, chroniclerT3Recipe); + LiquefactionBasinCache.addCraftingRecipe(chroniclerPanel4, chroniclerT4Recipe); + + LiquefactionBasinCache.addCraftingRecipe(realisationAltar3, realisationT3Recipe); + LiquefactionBasinCache.addCraftingRecipe(realisationAltar4, realisationT4Recipe); + + LiquefactionBasinCache.addCraftingRecipe(liquefactionBasin3, liquefactionT3Recipe); + LiquefactionBasinCache.addCraftingRecipe(liquefactionBasin4, liquefactionT4Recipe); + + LiquefactionBasinCache.addCraftingRecipe(staveConfigurator, staveConfiguratorRecipe); + + LiquefactionBasinCache.addCraftingRecipe(abstractionLamp, abstractionLampRecipe); + LiquefactionBasinCache.addCraftingRecipe(dispersionLamp, dispersionLampRecipe); + + LiquefactionBasinCache.addCraftingRecipe(inversionVacuum, inversionVacuumRecipe); + LiquefactionBasinCache.addCraftingRecipe(antipodalVacuum, antipodalVacuumRecipe); + } + +} diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Tools.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Tools.java index f0743b9e..0da784ed 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Tools.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/Tools.java @@ -1,27 +1,36 @@ package io.github.sefiraat.crystamaehistoria.slimefun; import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; +import io.github.sefiraat.crystamaehistoria.slimefun.tools.RefactingLens; import io.github.sefiraat.crystamaehistoria.slimefun.tools.stave.Stave; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryRarity; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; import io.github.sefiraat.crystamaehistoria.utils.theme.ThemeType; import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import lombok.Getter; +import lombok.experimental.UtilityClass; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +@UtilityClass public class Tools { - public static Stave STAVE_BASIC; - public static Stave STAVE_ADVANCED; - - public Tools() { + @Getter + private static Stave staveBasic; + @Getter + private static Stave staveAdvanced; + @Getter + private static RefactingLens refractingLens; + public static void setup() { final CrystamaeHistoria plugin = CrystamaeHistoria.getInstance(); - // Basic Stave final ItemStack elementalCrystal = Materials.CRYSTAL_MAP.get(StoryRarity.UNIQUE).get(StoryType.ELEMENTAL).getItem(); + final ItemStack amalgamateIngot = Materials.getAmalgamateIngotCommon().getItem(); + + // Basic Stave - STAVE_BASIC = new Stave( + staveBasic = new Stave( ItemGroups.TOOLS, ThemeType.themedSlimefunItemStack( "CRY_STAVE_1", @@ -41,9 +50,8 @@ null, new ItemStack(Material.STICK), null, ); // Advanced Stave - final ItemStack ingot = Materials.AMALGAMATE_INGOT.getItem(); - STAVE_ADVANCED = new Stave( + staveAdvanced = new Stave( ItemGroups.TOOLS, ThemeType.themedSlimefunItemStack( "CRY_STAVE_2", @@ -55,15 +63,40 @@ null, new ItemStack(Material.STICK), null, ), RecipeType.MAGIC_WORKBENCH, new ItemStack[]{ - ingot, ingot, ingot, - ingot, STAVE_BASIC.getItem().clone(), ingot, - ingot, ingot, ingot + amalgamateIngot, amalgamateIngot, amalgamateIngot, + amalgamateIngot, staveBasic.getItem().clone(), amalgamateIngot, + amalgamateIngot, amalgamateIngot, amalgamateIngot }, 2 ); + // Refracting Lens + final ItemStack ingot = Materials.getAmalgamateIngotCommon().getItem(); + + refractingLens = new RefactingLens( + ItemGroups.TOOLS, + ThemeType.themedSlimefunItemStack( + "CRY_REFRACTING_LENS", + new ItemStack(Material.SPYGLASS), + ThemeType.TOOL, + "Refracting Lens", + "This magical lens has glass that can", + "the lights of Crysta into it's", + "individual elements.", + ThemeType.CLICK_INFO.getColor() + "Right Click: " + ThemeType.PASSIVE.getColor() + "Shows the contents", + ThemeType.PASSIVE.getColor() + "of a Liquefaction Basin." + ), + RecipeType.MAGIC_WORKBENCH, + new ItemStack[]{ + null, Materials.getImbuedGlass().getItem(), null, + null, new ItemStack(Material.SPYGLASS), null, + null, ingot, null + } + ); + // Slimefun Registry - STAVE_BASIC.register(plugin); - STAVE_ADVANCED.register(plugin); + staveBasic.register(plugin); + staveAdvanced.register(plugin); + refractingLens.register(plugin); } } diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/AbstractCache.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/AbstractCache.java similarity index 94% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/AbstractCache.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/AbstractCache.java index ef125a28..9b24b222 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/AbstractCache.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/AbstractCache.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms; import io.github.sefiraat.crystamaehistoria.utils.Keys; import lombok.Getter; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/DisplayStandHolder.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/DisplayStandHolder.java similarity index 96% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/DisplayStandHolder.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/DisplayStandHolder.java index 75d7b94b..46f59cfd 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/DisplayStandHolder.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/DisplayStandHolder.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms; import io.github.sefiraat.crystamaehistoria.utils.ArmourStandUtils; import me.mrCookieSlime.Slimefun.api.BlockStorage; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/chroniclerpanel/ChroniclerPanel.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/chroniclerpanel/ChroniclerPanel.java similarity index 94% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/chroniclerpanel/ChroniclerPanel.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/chroniclerpanel/ChroniclerPanel.java index e7ce838c..4cef2df4 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/chroniclerpanel/ChroniclerPanel.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/chroniclerpanel/ChroniclerPanel.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.chroniclerpanel; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.chroniclerpanel; import io.github.mooy1.infinitylib.machines.TickingMenuBlock; import io.github.sefiraat.crystamaehistoria.utils.theme.GuiElements; @@ -32,9 +32,12 @@ public class ChroniclerPanel extends TickingMenuBlock { private final Map caches = new HashMap<>(); + private final int tier; + @ParametersAreNonnullByDefault - public ChroniclerPanel(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { + public ChroniclerPanel(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int tier) { super(itemGroup, item, recipeType, recipe); + this.tier = tier; this.addItemHandler(new BlockPlaceHandler(false) { @Override public void onPlayerPlace(@NotNull BlockPlaceEvent event) { diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/chroniclerpanel/ChroniclerPanelCache.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/chroniclerpanel/ChroniclerPanelCache.java similarity index 98% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/chroniclerpanel/ChroniclerPanelCache.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/chroniclerpanel/ChroniclerPanelCache.java index aaf72fc4..4b8be0c7 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/chroniclerpanel/ChroniclerPanelCache.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/chroniclerpanel/ChroniclerPanelCache.java @@ -1,8 +1,8 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.chroniclerpanel; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.chroniclerpanel; import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; import io.github.sefiraat.crystamaehistoria.runnables.animation.FloatingHeadAnimation; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.AbstractCache; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.AbstractCache; import io.github.sefiraat.crystamaehistoria.stories.StoriedBlockDefinition; import io.github.sefiraat.crystamaehistoria.stories.StoriesManager; import io.github.sefiraat.crystamaehistoria.utils.ArmourStandUtils; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobFan.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobFan.java new file mode 100644 index 00000000..826731ea --- /dev/null +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobFan.java @@ -0,0 +1,180 @@ +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.gadgets; + +import io.github.mooy1.infinitylib.machines.TickingMenuBlock; +import io.github.sefiraat.crystamaehistoria.slimefun.tools.stave.SpellSlot; +import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; +import io.github.sefiraat.crystamaehistoria.utils.theme.GuiElements; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; +import lombok.Getter; +import me.mrCookieSlime.Slimefun.api.BlockStorage; +import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; +import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Monster; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; +import java.util.UUID; + +public class MobFan extends TickingMenuBlock { + + protected static final int[] BACKGROUND_SLOTS = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 13, 15, 16, 17, 18, 19, 20, 21, 23, 25, 26, 27, 28, 30, 31, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 + }; + protected static final int SET_UP = 11; + protected static final int SET_DOWN = 29; + protected static final int SET_NORTH = 14; + protected static final int SET_WEST = 22; + protected static final int SET_SOUTH = 32; + protected static final int SET_EAST = 24; + + @Getter + private final double range; + @Getter + private UUID owner; + @Getter + private BlockFace direction; + + @ParametersAreNonnullByDefault + public MobFan(ItemGroup category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, double range) { + super(category, item, recipeType, recipe); + this.range = range; + this.addItemHandler( + new BlockPlaceHandler(false) { + @Override + public void onPlayerPlace(@NotNull BlockPlaceEvent event) { + BlockStorage.addBlockInfo(event.getBlock(), "CH_UUID", event.getPlayer().getUniqueId().toString()); + BlockStorage.addBlockInfo(event.getBlock(), "CH_DIRECTION", BlockFace.SELF.name()); + } + }, + new BlockBreakHandler(false, false) { + @Override + public void onPlayerBreak(BlockBreakEvent blockBreakEvent, ItemStack itemStack, List list) { + BlockStorage.clearBlockInfo(blockBreakEvent.getBlock()); + } + } + ); + } + + @Override + @ParametersAreNonnullByDefault + protected void onNewInstance(BlockMenu menu, Block b) { + this.owner = UUID.fromString(BlockStorage.getLocationInfo(b.getLocation(), "CH_UUID")); + this.direction = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "CH_DIRECTION")); + setDirection(menu, this.direction); + + menu.addMenuClickHandler(SET_NORTH, (player, i, itemStack, clickAction) -> setDirection(menu, BlockFace.NORTH)); + menu.addMenuClickHandler(SET_SOUTH, (player, i, itemStack, clickAction) -> setDirection(menu, BlockFace.SOUTH)); + menu.addMenuClickHandler(SET_EAST, (player, i, itemStack, clickAction) -> setDirection(menu, BlockFace.EAST)); + menu.addMenuClickHandler(SET_WEST, (player, i, itemStack, clickAction) -> setDirection(menu, BlockFace.WEST)); + menu.addMenuClickHandler(SET_UP, (player, i, itemStack, clickAction) -> setDirection(menu, BlockFace.UP)); + menu.addMenuClickHandler(SET_DOWN, (player, i, itemStack, clickAction) -> setDirection(menu, BlockFace.DOWN)); + + } + + @ParametersAreNonnullByDefault + private boolean setDirection(BlockMenu blockMenu, BlockFace blockFace) { + direction = blockFace; + BlockStorage.addBlockInfo(blockMenu.getBlock(), "CH_DIRECTION", blockFace.name()); + + blockMenu.replaceExistingItem(SET_UP, GuiElements.getDirectionalSlotPane(BlockFace.UP, false)); + blockMenu.replaceExistingItem(SET_DOWN, GuiElements.getDirectionalSlotPane(BlockFace.DOWN, false)); + blockMenu.replaceExistingItem(SET_NORTH, GuiElements.getDirectionalSlotPane(BlockFace.NORTH, false)); + blockMenu.replaceExistingItem(SET_SOUTH, GuiElements.getDirectionalSlotPane(BlockFace.SOUTH, false)); + blockMenu.replaceExistingItem(SET_EAST, GuiElements.getDirectionalSlotPane(BlockFace.EAST, false)); + blockMenu.replaceExistingItem(SET_WEST, GuiElements.getDirectionalSlotPane(BlockFace.WEST, false)); + + switch (blockFace) { + case UP: { + blockMenu.replaceExistingItem(SET_UP, GuiElements.getDirectionalSlotPane(blockFace, true)); + break; + } + case DOWN: { + blockMenu.replaceExistingItem(SET_DOWN, GuiElements.getDirectionalSlotPane(blockFace, true)); + break; + } + case NORTH: { + blockMenu.replaceExistingItem(SET_NORTH, GuiElements.getDirectionalSlotPane(blockFace, true)); + break; + } + case SOUTH: { + blockMenu.replaceExistingItem(SET_SOUTH, GuiElements.getDirectionalSlotPane(blockFace, true)); + break; + } + case EAST: { + blockMenu.replaceExistingItem(SET_EAST, GuiElements.getDirectionalSlotPane(blockFace, true)); + break; + } + case WEST: { + blockMenu.replaceExistingItem(SET_WEST, GuiElements.getDirectionalSlotPane(blockFace, true)); + break; + } + case SELF: { + break; + } + default: + throw new IllegalStateException("Unexpected value: " + blockFace); + } + + return false; + } + + @Override + @ParametersAreNonnullByDefault + protected void tick(Block block, BlockMenu blockMenu) { + if (direction != BlockFace.SELF) { + Location location = block.getLocation().add(0.5, 0.5, 0.5); + for (int i = 0; i < range; i++) { + Location offsetLocation = location.clone().add(direction.getDirection().clone().multiply(i)); + for (Entity entity : block.getWorld().getNearbyEntities(offsetLocation, 0.5, 0.5, 0.5)) { + GeneralUtils.pushEntity( + owner, + block.getLocation().clone().add(0.5, 0.5, 0.5), + entity, + 1 + ); + } + } + } + } + + @Override + @ParametersAreNonnullByDefault + protected void setup(BlockMenuPreset blockMenuPreset) { + blockMenuPreset.drawBackground(BACKGROUND_SLOTS); + + blockMenuPreset.addItem(SET_NORTH, GuiElements.getDirectionalSlotPane(BlockFace.NORTH, false), (player, i, itemStack, clickAction) -> false); + blockMenuPreset.addItem(SET_SOUTH, GuiElements.getDirectionalSlotPane(BlockFace.SOUTH, false), (player, i, itemStack, clickAction) -> false); + blockMenuPreset.addItem(SET_EAST, GuiElements.getDirectionalSlotPane(BlockFace.EAST, false), (player, i, itemStack, clickAction) -> false); + blockMenuPreset.addItem(SET_WEST, GuiElements.getDirectionalSlotPane(BlockFace.WEST, false), (player, i, itemStack, clickAction) -> false); + + blockMenuPreset.addItem(SET_UP, GuiElements.getDirectionalSlotPane(BlockFace.UP, false), (player, i, itemStack, clickAction) -> false); + blockMenuPreset.addItem(SET_DOWN, GuiElements.getDirectionalSlotPane(BlockFace.DOWN, false), (player, i, itemStack, clickAction) -> false); + } + + @Override + protected int[] getInputSlots() { + return new int[0]; + } + + @Override + protected int[] getOutputSlots() { + return new int[0]; + } + + @Override + protected boolean synchronous() { + return true; + } +} diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobLamp.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobLamp.java new file mode 100644 index 00000000..d9d12ea5 --- /dev/null +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/gadgets/MobLamp.java @@ -0,0 +1,75 @@ +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.gadgets; + +import io.github.sefiraat.crystamaehistoria.utils.GeneralUtils; +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import io.github.thebusybiscuit.slimefun4.core.handlers.BlockBreakHandler; +import io.github.thebusybiscuit.slimefun4.core.handlers.BlockPlaceHandler; +import lombok.Getter; +import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; +import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; +import me.mrCookieSlime.Slimefun.api.BlockStorage; +import org.bukkit.block.Block; +import org.bukkit.entity.Monster; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; +import java.util.UUID; + +public class MobLamp extends SlimefunItem { + + protected static final int[] BACKGROUND_SLOTS = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 24, 25, 26, 27, 28, 29, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 + }; + + @Getter + private final double radius; + @Getter + private final double force; + + @ParametersAreNonnullByDefault + public MobLamp(ItemGroup category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, double radius, double force) { + super(category, item, recipeType, recipe); + this.radius = radius; + this.force = force; + this.addItemHandler( + new BlockPlaceHandler(false) { + @Override + public void onPlayerPlace(@NotNull BlockPlaceEvent event) { + BlockStorage.addBlockInfo(event.getBlock(), "CH_UUID", event.getPlayer().getUniqueId().toString()); + } + }, + new BlockBreakHandler(false, false) { + @Override + public void onPlayerBreak(BlockBreakEvent blockBreakEvent, ItemStack itemStack, List list) { + BlockStorage.clearBlockInfo(blockBreakEvent.getBlock()); + } + }, + new BlockTicker() { + @Override + public boolean isSynchronized() { + return true; + } + + @Override + public void tick(Block block, SlimefunItem slimefunItem, Config config) { + for (Monster monster : block.getWorld().getNearbyEntitiesByType(Monster.class, block.getLocation(), radius)) { + UUID uuid = UUID.fromString(BlockStorage.getLocationInfo(block.getLocation(), "CH_UUID")); + GeneralUtils.pushEntity( + uuid, + block.getLocation().clone().add(0.5, 0.5, 0.5), + monster, + force + ); + } + } + } + ); + } +} diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/DummyLiquefactionBasinCrafting.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/DummyLiquefactionBasinCrafting.java similarity index 92% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/DummyLiquefactionBasinCrafting.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/DummyLiquefactionBasinCrafting.java index 95b62d50..56d5e234 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/DummyLiquefactionBasinCrafting.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/DummyLiquefactionBasinCrafting.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin; import io.github.sefiraat.crystamaehistoria.utils.Keys; import io.github.sefiraat.crystamaehistoria.utils.theme.ThemeType; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/DummyLiquefactionBasinSpell.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/DummyLiquefactionBasinSpell.java similarity index 91% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/DummyLiquefactionBasinSpell.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/DummyLiquefactionBasinSpell.java index aa8a97bc..8857022e 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/DummyLiquefactionBasinSpell.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/DummyLiquefactionBasinSpell.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin; import io.github.sefiraat.crystamaehistoria.utils.Keys; import io.github.sefiraat.crystamaehistoria.utils.theme.ThemeType; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/LiquefactionBasin.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/LiquefactionBasin.java similarity index 93% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/LiquefactionBasin.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/LiquefactionBasin.java index d6f902ff..89b9255e 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/LiquefactionBasin.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/LiquefactionBasin.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin; import io.github.mooy1.infinitylib.machines.TickingMenuBlock; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; @@ -28,20 +28,20 @@ public class LiquefactionBasin extends TickingMenuBlock { protected static final int[] BACKGROUND_SLOTS = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 15, 16, 17, 18, 19, 20, 24, 25, 26, 27, 28, 29, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 }; - protected static final int[] BACKGROUND_INPUT = { - 12, 13, 14, 21, 23, 30, 31, 32 - }; protected static final int INPUT_SLOT = 22; protected static final Map CACHE_MAP = new HashMap<>(); + public final int maxVolume; + @ParametersAreNonnullByDefault - public LiquefactionBasin(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { + public LiquefactionBasin(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int maxVolume) { super(itemGroup, item, recipeType, recipe); + this.maxVolume = maxVolume; this.addItemHandler(new BlockPlaceHandler(false) { @Override public void onPlayerPlace(@NotNull BlockPlaceEvent event) { final Location location = event.getBlockPlaced().getLocation(); - final LiquefactionBasinCache cache = new LiquefactionBasinCache(BlockStorage.getInventory(location)); + final LiquefactionBasinCache cache = new LiquefactionBasinCache(BlockStorage.getInventory(location), maxVolume); cache.setActivePlayer(event.getPlayer()); CACHE_MAP.put(location, cache); } @@ -96,7 +96,7 @@ protected void onBreak(BlockBreakEvent event, BlockMenu blockMenu) { protected void onNewInstance(BlockMenu blockMenu, Block b) { super.onNewInstance(blockMenu, b); if (!CACHE_MAP.containsKey(blockMenu.getLocation())) { - LiquefactionBasinCache cache = new LiquefactionBasinCache(blockMenu); + LiquefactionBasinCache cache = new LiquefactionBasinCache(blockMenu, this.maxVolume); Config c = BlockStorage.getLocationInfo(blockMenu.getLocation()); for (String key : c.getKeys()) { diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/LiquefactionBasinCache.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/LiquefactionBasinCache.java similarity index 97% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/LiquefactionBasinCache.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/LiquefactionBasinCache.java index 51de2369..af18b619 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/LiquefactionBasinCache.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/LiquefactionBasinCache.java @@ -1,10 +1,10 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin; import de.slikey.effectlib.effect.SphereEffect; import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; import io.github.sefiraat.crystamaehistoria.magic.SpellType; import io.github.sefiraat.crystamaehistoria.magic.spells.core.InstancePlate; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.DisplayStandHolder; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.DisplayStandHolder; import io.github.sefiraat.crystamaehistoria.slimefun.materials.Crystal; import io.github.sefiraat.crystamaehistoria.slimefun.tools.plates.BlankPlate; import io.github.sefiraat.crystamaehistoria.slimefun.tools.plates.ChargedPlate; @@ -56,12 +56,13 @@ public class LiquefactionBasinCache extends DisplayStandHolder { public static final double LOWEST_LEVEL = -1.7; public static final double HIGHEST_LEVEL = -1; - public static final double MAX_VOLUME = 1000; protected static final Map RARITY_VALUE_MAP = new EnumMap<>(StoryRarity.class); protected static final String CH_LEVEL_PREFIX = "ch_c_lvl:"; private static final Map RECIPES_SPELL = new HashMap<>(); private static final Map RECIPES_ITEMS = new HashMap<>(); + private final double maxVolume; + static { RARITY_VALUE_MAP.put(StoryRarity.COMMON, 1); RARITY_VALUE_MAP.put(StoryRarity.UNCOMMON, 3); @@ -74,8 +75,9 @@ public class LiquefactionBasinCache extends DisplayStandHolder { private final Map contentMap = new EnumMap<>(StoryType.class); @ParametersAreNonnullByDefault - public LiquefactionBasinCache(BlockMenu blockMenu) { + public LiquefactionBasinCache(BlockMenu blockMenu, double maxVolume) { super(blockMenu); + this.maxVolume = maxVolume; final String activePlayerString = BlockStorage.getLocationInfo(blockMenu.getLocation(), Keys.BS_CP_ACTIVE_PLAYER); if (activePlayerString != null) { @@ -139,7 +141,7 @@ private void rejectItem(Item item, boolean punish) { private void addCrystamae(StoryType type, StoryRarity rarity, Item item) { final int numberInStack = item.getItemStack().getAmount(); final int amount = LiquefactionBasinCache.RARITY_VALUE_MAP.get(rarity) * numberInStack; - if (getFillLevel() + amount > MAX_VOLUME) { + if (getFillLevel() + amount > maxVolume) { rejectItem(item, false); } else { if (contentMap.containsKey(type)) { @@ -211,7 +213,7 @@ private void clearBlockStorage() { @ParametersAreNonnullByDefault private void setFillHeight(ArmorStand armorStand) { final double diff = HIGHEST_LEVEL - LOWEST_LEVEL; - final double incrementAmount = diff / MAX_VOLUME; + final double incrementAmount = diff / maxVolume; final double amount = incrementAmount * getFillLevel(); final Location location = blockMenu.getLocation().clone().add(0.5, -1.7 + amount, 0.5); armorStand.teleport(location); diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/RecipeItem.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/RecipeItem.java similarity index 96% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/RecipeItem.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/RecipeItem.java index 1ce73bad..f565d940 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/RecipeItem.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/RecipeItem.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin; import io.github.sefiraat.crystamaehistoria.slimefun.Materials; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/RecipeSpell.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/RecipeSpell.java similarity index 89% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/RecipeSpell.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/RecipeSpell.java index 67f5deec..cce3b4d2 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/liquefactionbasin/RecipeSpell.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/liquefactionbasin/RecipeSpell.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.liquefactionbasin; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.liquefactionbasin; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryType; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/DummyRealisationAltar.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/DummyRealisationAltar.java similarity index 92% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/DummyRealisationAltar.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/DummyRealisationAltar.java index a2a5c813..f0173a37 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/DummyRealisationAltar.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/DummyRealisationAltar.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.realisationaltar; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.realisationaltar; import io.github.sefiraat.crystamaehistoria.utils.Keys; import io.github.sefiraat.crystamaehistoria.utils.theme.ThemeType; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/RealisationAltar.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/RealisationAltar.java similarity index 92% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/RealisationAltar.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/RealisationAltar.java index 05ba6c5b..d995345d 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/RealisationAltar.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/RealisationAltar.java @@ -1,10 +1,11 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.realisationaltar; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.realisationaltar; import io.github.mooy1.infinitylib.machines.TickingMenuBlock; import io.github.sefiraat.crystamaehistoria.utils.theme.GuiElements; import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import lombok.Getter; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset; import org.bukkit.Location; @@ -28,9 +29,13 @@ public class RealisationAltar extends TickingMenuBlock { protected static final Map CACHE_MAP = new HashMap<>(); + @Getter + private final int tier; + @ParametersAreNonnullByDefault - public RealisationAltar(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { + public RealisationAltar(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, int tier) { super(itemGroup, item, recipeType, recipe); + this.tier = tier; } public static Map getCaches() { diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/RealisationAltarCache.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/RealisationAltarCache.java similarity index 98% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/RealisationAltarCache.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/RealisationAltarCache.java index 2c71cb19..fd25f3d8 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/realisationaltar/RealisationAltarCache.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/realisationaltar/RealisationAltarCache.java @@ -1,7 +1,7 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.realisationaltar; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.realisationaltar; import io.github.sefiraat.crystamaehistoria.CrystamaeHistoria; -import io.github.sefiraat.crystamaehistoria.slimefun.machines.AbstractCache; +import io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.AbstractCache; import io.github.sefiraat.crystamaehistoria.stories.StoriesManager; import io.github.sefiraat.crystamaehistoria.stories.Story; import io.github.sefiraat.crystamaehistoria.stories.definition.StoryRarity; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/staveconfigurator/StaveConfigurator.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/staveconfigurator/StaveConfigurator.java similarity index 99% rename from src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/staveconfigurator/StaveConfigurator.java rename to src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/staveconfigurator/StaveConfigurator.java index c6a9c32a..b1b2a5fc 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/machines/staveconfigurator/StaveConfigurator.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/mechanisms/staveconfigurator/StaveConfigurator.java @@ -1,4 +1,4 @@ -package io.github.sefiraat.crystamaehistoria.slimefun.machines.staveconfigurator; +package io.github.sefiraat.crystamaehistoria.slimefun.mechanisms.staveconfigurator; import io.github.mooy1.infinitylib.machines.MenuBlock; import io.github.sefiraat.crystamaehistoria.magic.spells.core.InstancePlate; diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/RefactingLens.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/RefactingLens.java new file mode 100644 index 00000000..e2109575 --- /dev/null +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/RefactingLens.java @@ -0,0 +1,19 @@ +package io.github.sefiraat.crystamaehistoria.slimefun.tools; + +import io.github.thebusybiscuit.slimefun4.api.items.ItemGroup; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem; +import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItemStack; +import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType; +import lombok.Getter; +import org.bukkit.inventory.ItemStack; + +import javax.annotation.ParametersAreNonnullByDefault; + +public class RefactingLens extends SlimefunItem { + + @ParametersAreNonnullByDefault + public RefactingLens(ItemGroup itemGroup, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { + super(itemGroup, item, recipeType, recipe); + } + +} diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/plates/ChargedPlate.java b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/plates/ChargedPlate.java index 7d9c4cdb..5c29f994 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/plates/ChargedPlate.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/slimefun/tools/plates/ChargedPlate.java @@ -34,7 +34,7 @@ public static ItemStack getChargedPlate(int tier, SpellType spellType, int cryst @Nonnull @ParametersAreNonnullByDefault public static ItemStack getChargedPlate(InstancePlate instancePlate) { - ItemStack newPlate = Materials.CHARGED_PLATE_T_1.getItem().clone(); + ItemStack newPlate = Materials.getChargedPlate().getItem().clone(); InstancePlate.setPlateLore(newPlate, instancePlate); ItemMeta itemMeta = newPlate.getItemMeta(); DataTypeMethods.setCustom( diff --git a/src/main/java/io/github/sefiraat/crystamaehistoria/utils/theme/GuiElements.java b/src/main/java/io/github/sefiraat/crystamaehistoria/utils/theme/GuiElements.java index 8986f58b..fe90d76c 100644 --- a/src/main/java/io/github/sefiraat/crystamaehistoria/utils/theme/GuiElements.java +++ b/src/main/java/io/github/sefiraat/crystamaehistoria/utils/theme/GuiElements.java @@ -6,6 +6,7 @@ import lombok.experimental.UtilityClass; import net.md_5.bungee.api.ChatColor; import org.bukkit.Material; +import org.bukkit.block.BlockFace; import org.bukkit.inventory.ItemStack; import java.text.MessageFormat; @@ -115,4 +116,12 @@ public static CustomItemStack getSpellSlotPane(SpellSlot spellSlot) { ChatColor.GRAY + "Spell Slot : " + ThemeType.toTitleCase(spellSlot.name()) ); } + + public static CustomItemStack getDirectionalSlotPane(BlockFace blockFace, boolean active) { + Material material = active ? Material.RED_STAINED_GLASS_PANE : Material.GREEN_STAINED_GLASS_PANE; + return new CustomItemStack( + material, + ChatColor.GRAY + "Set direction: " + blockFace.name() + ); + } }