mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

[CI skip] Refactoring

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-01-12 11:05:35 +01:00
parent fe6caccee9
commit 7c993ead57
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/AncientAltarListener.java → src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AncientAltarListener.java
View File

@ -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;

2
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AncientPedestal.java
View File

@ -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 {

2
src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java
View File

@ -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;

3
src/main/java/me/mrCookieSlime/Slimefun/ancient_altar/RitualAnimation.java
View File

@ -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<Item, Location> entry : itemLock.entrySet()) {
if (entry.getKey().getLocation().distance(entry.getValue()) > 0.3) {
if (entry.getKey().getLocation().distanceSquared(entry.getValue()) > 0.1) {
return false;
}
}