From 7c993ead573e5d6c9faaee5697442ea43c6eece8 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sun, 12 Jan 2020 11:05:35 +0100 Subject: [PATCH] [CI skip] Refactoring --- .../implementation/listeners}/AncientAltarListener.java | 4 +++- .../Objects/SlimefunItem/machines/AncientPedestal.java | 2 +- src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java | 2 +- .../mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) rename src/main/java/{me/mrCookieSlime/Slimefun/ancient_altar => io/github/thebusybiscuit/slimefun4/implementation/listeners}/AncientAltarListener.java (97%) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java similarity index 97% rename from src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java rename to src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java index 79cc75478..ea769f3a6 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java @@ -1,4 +1,4 @@ -package me.mrCookieSlime.Slimefun.ancient_altar; +package io.github.thebusybiscuit.slimefun4.implementation.listeners; import java.util.ArrayList; import java.util.HashSet; @@ -30,6 +30,8 @@ import io.github.thebusybiscuit.cscorelib2.inventory.ItemUtils; import io.github.thebusybiscuit.cscorelib2.item.CustomItem; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.SlimefunItems; +import me.mrCookieSlime.Slimefun.ancient_altar.Pedestals; +import me.mrCookieSlime.Slimefun.ancient_altar.RitualAnimation; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.Slimefun; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AncientPedestal.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AncientPedestal.java index f70976feb..a1b501a34 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AncientPedestal.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AncientPedestal.java @@ -3,11 +3,11 @@ package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines; import org.bukkit.entity.Item; import org.bukkit.inventory.ItemStack; +import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.Lists.RecipeType; import me.mrCookieSlime.Slimefun.Objects.Category; import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import me.mrCookieSlime.Slimefun.ancient_altar.AncientAltarListener; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; public class AncientPedestal extends SlimefunItem { diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 738e48685..40ac70ceb 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -28,6 +28,7 @@ import io.github.thebusybiscuit.slimefun4.implementation.geo.resources.NetherIce import io.github.thebusybiscuit.slimefun4.implementation.geo.resources.OilResource; import io.github.thebusybiscuit.slimefun4.implementation.geo.resources.SaltResource; import io.github.thebusybiscuit.slimefun4.implementation.geo.resources.UraniumResource; +import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.AndroidKillingListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.AutonomousToolsListener; import io.github.thebusybiscuit.slimefun4.implementation.listeners.BackpackListener; @@ -68,7 +69,6 @@ import me.mrCookieSlime.Slimefun.Setup.MiscSetup; import me.mrCookieSlime.Slimefun.Setup.ResearchSetup; import me.mrCookieSlime.Slimefun.Setup.SlimefunSetup; import me.mrCookieSlime.Slimefun.Setup.WikiSetup; -import me.mrCookieSlime.Slimefun.ancient_altar.AncientAltarListener; import me.mrCookieSlime.Slimefun.api.BlockStorage; import me.mrCookieSlime.Slimefun.api.PlayerProfile; import me.mrCookieSlime.Slimefun.api.Slimefun; diff --git a/src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java b/src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java index 99cf60782..e0392f015 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java @@ -15,6 +15,7 @@ import org.bukkit.block.Block; import org.bukkit.entity.Item; import org.bukkit.inventory.ItemStack; +import io.github.thebusybiscuit.slimefun4.implementation.listeners.AncientAltarListener; import me.mrCookieSlime.Slimefun.SlimefunPlugin; import me.mrCookieSlime.Slimefun.api.Slimefun; @@ -79,7 +80,7 @@ public class RitualAnimation implements Runnable { private boolean checkLockedItems() { for (Map.Entry entry : itemLock.entrySet()) { - if (entry.getKey().getLocation().distance(entry.getValue()) > 0.3) { + if (entry.getKey().getLocation().distanceSquared(entry.getValue()) > 0.1) { return false; } }