mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 11:45:51 +00:00
Logger Conversion Pt.2
This commit is contained in:
parent
c293605312
commit
01fd2cd38c
@ -19,6 +19,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.InvUtils;
|
|||||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
|
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
|
||||||
import me.mrCookieSlime.EmeraldEnchants.EmeraldEnchants;
|
import me.mrCookieSlime.EmeraldEnchants.EmeraldEnchants;
|
||||||
import me.mrCookieSlime.EmeraldEnchants.ItemEnchantment;
|
import me.mrCookieSlime.EmeraldEnchants.ItemEnchantment;
|
||||||
|
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||||
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
import me.mrCookieSlime.Slimefun.Lists.RecipeType;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.Category;
|
import me.mrCookieSlime.Slimefun.Objects.Category;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||||
@ -26,7 +27,6 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
|||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||||
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
|
||||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||||
|
|
||||||
@ -109,7 +109,7 @@ public class AutoDisenchanter extends AContainer {
|
|||||||
enchantments.put(e.getKey(), e.getValue());
|
enchantments.put(e.getKey(), e.getValue());
|
||||||
amount++;
|
amount++;
|
||||||
}
|
}
|
||||||
if (Slimefun.isEmeraldEnchantsInstalled()) {
|
if (SlimefunPlugin.getHooks().isEmeraldEnchantsInstalled()) {
|
||||||
for (ItemEnchantment enchantment: EmeraldEnchants.getInstance().getRegistry().getEnchantments(item)) {
|
for (ItemEnchantment enchantment: EmeraldEnchants.getInstance().getRegistry().getEnchantments(item)) {
|
||||||
amount++;
|
amount++;
|
||||||
enchantments2.add(enchantment);
|
enchantments2.add(enchantment);
|
||||||
|
@ -27,7 +27,6 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.AContainer;
|
|||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineHelper;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.abstractItems.MachineRecipe;
|
||||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||||
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
|
||||||
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
|
||||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||||
|
|
||||||
@ -112,7 +111,7 @@ public class AutoEnchanter extends AContainer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Slimefun.isEmeraldEnchantsInstalled()) {
|
if (SlimefunPlugin.getHooks().isEmeraldEnchantsInstalled()) {
|
||||||
for (ItemEnchantment enchantment: EmeraldEnchants.getInstance().getRegistry().getEnchantments(item)) {
|
for (ItemEnchantment enchantment: EmeraldEnchants.getInstance().getRegistry().getEnchantments(item)) {
|
||||||
if (EmeraldEnchants.getInstance().getRegistry().isApplicable(target, enchantment.getEnchantment()) && EmeraldEnchants.getInstance().getRegistry().getEnchantmentLevel(target, enchantment.getEnchantment().getName()) < enchantment.getLevel()) {
|
if (EmeraldEnchants.getInstance().getRegistry().isApplicable(target, enchantment.getEnchantment()) && EmeraldEnchants.getInstance().getRegistry().getEnchantmentLevel(target, enchantment.getEnchantment().getName()) < enchantment.getLevel()) {
|
||||||
amount++;
|
amount++;
|
||||||
|
@ -417,7 +417,7 @@ public final class SlimefunGuide {
|
|||||||
);
|
);
|
||||||
|
|
||||||
List<Category> categories = Slimefun.currentCategories;
|
List<Category> categories = Slimefun.currentCategories;
|
||||||
List<GuideHandler> handlers = Slimefun.guideHandlers.values().stream().flatMap(List::stream).collect(Collectors.toList());
|
List<GuideHandler> handlers = SlimefunPlugin.getUtilities().guideHandlers.values().stream().flatMap(List::stream).collect(Collectors.toList());
|
||||||
|
|
||||||
int index = 9;
|
int index = 9;
|
||||||
int pages = 1;
|
int pages = 1;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package me.mrCookieSlime.Slimefun;
|
package me.mrCookieSlime.Slimefun;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.bstats.bukkit.Metrics;
|
import org.bstats.bukkit.Metrics;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@ -81,13 +82,12 @@ public final class SlimefunPlugin extends JavaPlugin {
|
|||||||
|
|
||||||
public static SlimefunPlugin instance;
|
public static SlimefunPlugin instance;
|
||||||
|
|
||||||
|
private TickerTask ticker;
|
||||||
private Config researches;
|
private Config researches;
|
||||||
private Config items;
|
private Config items;
|
||||||
private Config whitelist;
|
private Config whitelist;
|
||||||
private Config config;
|
private Config config;
|
||||||
|
|
||||||
public static TickerTask ticker;
|
|
||||||
|
|
||||||
public GPSNetwork gps = new GPSNetwork();
|
public GPSNetwork gps = new GPSNetwork();
|
||||||
private Utilities utilities = new Utilities();
|
private Utilities utilities = new Utilities();
|
||||||
private Settings settings;
|
private Settings settings;
|
||||||
@ -188,7 +188,7 @@ public final class SlimefunPlugin extends JavaPlugin {
|
|||||||
try {
|
try {
|
||||||
SlimefunSetup.setupItems();
|
SlimefunSetup.setupItems();
|
||||||
} catch (Exception x) {
|
} catch (Exception x) {
|
||||||
x.printStackTrace();
|
getLogger().log(Level.SEVERE, "An Error occured while initializing SlimefunItems for Slimefun " + Slimefun.getVersion());
|
||||||
}
|
}
|
||||||
MiscSetup.loadDescriptions();
|
MiscSetup.loadDescriptions();
|
||||||
|
|
||||||
@ -242,7 +242,6 @@ public final class SlimefunPlugin extends JavaPlugin {
|
|||||||
|
|
||||||
// Initiating various Stuff and all Items with a slightly delay (0ms after the Server finished loading)
|
// Initiating various Stuff and all Items with a slightly delay (0ms after the Server finished loading)
|
||||||
getServer().getScheduler().scheduleSyncDelayedTask(this, () -> {
|
getServer().getScheduler().scheduleSyncDelayedTask(this, () -> {
|
||||||
Slimefun.emeraldenchants = getServer().getPluginManager().isPluginEnabled("EmeraldEnchants");
|
|
||||||
MiscSetup.loadItems(settings);
|
MiscSetup.loadItems(settings);
|
||||||
|
|
||||||
for (World world: Bukkit.getWorlds()) {
|
for (World world: Bukkit.getWorlds()) {
|
||||||
@ -344,10 +343,10 @@ public final class SlimefunPlugin extends JavaPlugin {
|
|||||||
storage.save(true);
|
storage.save(true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
System.err.println("[Slimefun] Could not save Slimefun Blocks for World \"" + world.getName() + "\"");
|
getLogger().log(Level.SEVERE, "Could not save Slimefun Blocks for World \"" + world.getName() + "\"");
|
||||||
}
|
}
|
||||||
} catch (Exception x) {
|
} catch (Exception x) {
|
||||||
x.printStackTrace();
|
getLogger().log(Level.SEVERE, "An Error occured while saving Slimefun-Blocks in World '" + world.getName() + "' for Slimefun " + Slimefun.getVersion());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -383,7 +382,6 @@ public final class SlimefunPlugin extends JavaPlugin {
|
|||||||
ChargableBlock.maxCharges = null;
|
ChargableBlock.maxCharges = null;
|
||||||
AContainer.processing = null;
|
AContainer.processing = null;
|
||||||
AContainer.progress = null;
|
AContainer.progress = null;
|
||||||
Slimefun.guideHandlers = null;
|
|
||||||
EnergyNet.machinesInput = null;
|
EnergyNet.machinesInput = null;
|
||||||
EnergyNet.machinesOutput = null;
|
EnergyNet.machinesOutput = null;
|
||||||
EnergyNet.machinesStorage = null;
|
EnergyNet.machinesStorage = null;
|
||||||
@ -443,4 +441,8 @@ public final class SlimefunPlugin extends JavaPlugin {
|
|||||||
return instance.settings;
|
return instance.settings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static TickerTask getTicker() {
|
||||||
|
return instance.ticker;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -4,8 +4,10 @@ import java.util.ArrayList;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
||||||
import me.mrCookieSlime.Slimefun.utils.Utilities;
|
import me.mrCookieSlime.Slimefun.utils.Utilities;
|
||||||
|
|
||||||
import org.bukkit.Effect;
|
import org.bukkit.Effect;
|
||||||
@ -94,8 +96,8 @@ public class RitualAnimation implements Runnable {
|
|||||||
l.getWorld().spawnParticle(Particle.ENCHANTMENT_TABLE, l2,16, 0.3F, 0.2F, 0.3F);
|
l.getWorld().spawnParticle(Particle.ENCHANTMENT_TABLE, l2,16, 0.3F, 0.2F, 0.3F);
|
||||||
l.getWorld().spawnParticle(Particle.CRIT_MAGIC,l2,8, 0.3F, 0.2F, 0.3F);
|
l.getWorld().spawnParticle(Particle.CRIT_MAGIC,l2,8, 0.3F, 0.2F, 0.3F);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception x) {
|
||||||
e.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while playing Ritual Animation for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -113,8 +115,8 @@ public class RitualAnimation implements Runnable {
|
|||||||
try {
|
try {
|
||||||
l.getWorld().spawnParticle(Particle.ENCHANTMENT_TABLE,pedestal.getLocation().add(0.5, 1.5, 0.5),16, 0.3F, 0.2F, 0.3F);
|
l.getWorld().spawnParticle(Particle.ENCHANTMENT_TABLE,pedestal.getLocation().add(0.5, 1.5, 0.5),16, 0.3F, 0.2F, 0.3F);
|
||||||
l.getWorld().spawnParticle(Particle.CRIT_MAGIC,pedestal.getLocation().add(0.5, 1.5, 0.5), 8,0.3F, 0.2F, 0.3F);
|
l.getWorld().spawnParticle(Particle.CRIT_MAGIC,pedestal.getLocation().add(0.5, 1.5, 0.5), 8,0.3F, 0.2F, 0.3F);
|
||||||
} catch (Exception e) {
|
} catch (Exception x) {
|
||||||
e.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while playing Pedestal Animation for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
|
|
||||||
itemLock.remove(item);
|
itemLock.remove(item);
|
||||||
|
@ -11,6 +11,7 @@ import java.util.Optional;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.function.Predicate;
|
import java.util.function.Predicate;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
@ -61,6 +62,7 @@ import me.mrCookieSlime.Slimefun.Setup.Messages;
|
|||||||
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
|
||||||
import me.mrCookieSlime.Slimefun.androids.comparators.ScriptReputationSorter;
|
import me.mrCookieSlime.Slimefun.androids.comparators.ScriptReputationSorter;
|
||||||
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
import me.mrCookieSlime.Slimefun.api.BlockStorage;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
||||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
|
||||||
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
|
||||||
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow;
|
||||||
@ -143,8 +145,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
public void init() {
|
public void init() {
|
||||||
try {
|
try {
|
||||||
constructMenu(this);
|
constructMenu(this);
|
||||||
} catch (Exception e) {
|
} catch (Exception x) {
|
||||||
e.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while constructing an Android Inventory for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -186,8 +188,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
} catch (Exception e) {
|
} catch (Exception x) {
|
||||||
e.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while creating a new Instance of an Android Inventory for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -240,11 +242,8 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void tick(Block b) {
|
protected void tick(Block b) {
|
||||||
try {
|
|
||||||
if (!(b.getState() instanceof Skull)) {
|
if (!(b.getState() instanceof Skull)) {
|
||||||
return;
|
// The Android was destroyed or moved.
|
||||||
}
|
|
||||||
} catch (NullPointerException x) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -279,28 +278,13 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
|
|
||||||
switch (part) {
|
switch (part) {
|
||||||
case GO_DOWN:
|
case GO_DOWN:
|
||||||
try {
|
move(b, face, b.getRelative(BlockFace.DOWN));
|
||||||
Block block = b.getRelative(BlockFace.DOWN);
|
|
||||||
move(b, face, block);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case GO_FORWARD:
|
case GO_FORWARD:
|
||||||
try {
|
move(b, face, b.getRelative(face));
|
||||||
Block block = b.getRelative(face);
|
|
||||||
move(b, face, block);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case GO_UP:
|
case GO_UP:
|
||||||
try {
|
move(b, face, b.getRelative(BlockFace.UP));
|
||||||
Block block = b.getRelative(BlockFace.UP);
|
|
||||||
move(b, face, block);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case REPEAT:
|
case REPEAT:
|
||||||
BlockStorage.addBlockInfo(b, "index", String.valueOf(0));
|
BlockStorage.addBlockInfo(b, "index", String.valueOf(0));
|
||||||
@ -498,15 +482,19 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void move(Block b, BlockFace face, Block block) throws Exception {
|
private void move(Block b, BlockFace face, Block block) {
|
||||||
if (block.getY() < 0 || block.getY() > block.getWorld().getMaxHeight())
|
if (block.getY() > 0 && block.getY() < block.getWorld().getMaxHeight() && (block.getType() == Material.AIR || block.getType() == Material.CAVE_AIR)) {
|
||||||
return;
|
|
||||||
if (block.getType() == Material.AIR || block.getType() == Material.CAVE_AIR) {
|
|
||||||
block.setType(Material.PLAYER_HEAD);
|
block.setType(Material.PLAYER_HEAD);
|
||||||
Rotatable blockData = (Rotatable) block.getBlockData();
|
Rotatable blockData = (Rotatable) block.getBlockData();
|
||||||
blockData.setRotation(face.getOppositeFace());
|
blockData.setRotation(face.getOppositeFace());
|
||||||
block.setBlockData(blockData);
|
block.setBlockData(blockData);
|
||||||
|
|
||||||
|
try {
|
||||||
CustomSkull.setSkull(block, CustomSkull.getTexture(getItem()));
|
CustomSkull.setSkull(block, CustomSkull.getTexture(getItem()));
|
||||||
|
} catch (Exception x) {
|
||||||
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while moving an Android for Slimefun " + Slimefun.getVersion(), x);
|
||||||
|
}
|
||||||
|
|
||||||
b.setType(Material.AIR);
|
b.setType(Material.AIR);
|
||||||
BlockStorage.moveBlockInfo(b.getLocation(), block.getLocation());
|
BlockStorage.moveBlockInfo(b.getLocation(), block.getLocation());
|
||||||
}
|
}
|
||||||
@ -577,11 +565,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
try {
|
|
||||||
move(b, face, block);
|
move(b, face, block);
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,12 @@
|
|||||||
package me.mrCookieSlime.Slimefun.androids;
|
package me.mrCookieSlime.Slimefun.androids;
|
||||||
|
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
|
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
|
||||||
import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull;
|
import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
||||||
|
|
||||||
public enum ScriptPart {
|
public enum ScriptPart {
|
||||||
|
|
||||||
@ -63,7 +66,7 @@ public enum ScriptPart {
|
|||||||
this.type = type;
|
this.type = type;
|
||||||
this.item = new CustomItem(CustomSkull.getItem(texture), name);
|
this.item = new CustomItem(CustomSkull.getItem(texture), name);
|
||||||
} catch(Exception x) {
|
} catch(Exception x) {
|
||||||
x.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while initializing Android-Script Texture for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -446,7 +446,7 @@ public class BlockStorage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void clearBlockInfo(Location l, boolean destroy) {
|
public static void clearBlockInfo(Location l, boolean destroy) {
|
||||||
SlimefunPlugin.ticker.delete.put(l, destroy);
|
SlimefunPlugin.getTicker().delete.put(l, destroy);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void _integrated_removeBlockInfo(Location l, boolean destroy) {
|
public static void _integrated_removeBlockInfo(Location l, boolean destroy) {
|
||||||
@ -481,7 +481,7 @@ public class BlockStorage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void moveBlockInfo(Location from, Location to) {
|
public static void moveBlockInfo(Location from, Location to) {
|
||||||
SlimefunPlugin.ticker.move.put(from, to);
|
SlimefunPlugin.getTicker().move.put(from, to);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
|
@ -2,9 +2,7 @@ package me.mrCookieSlime.Slimefun.api;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -17,8 +15,8 @@ import me.mrCookieSlime.Slimefun.Objects.Category;
|
|||||||
import me.mrCookieSlime.Slimefun.Objects.Research;
|
import me.mrCookieSlime.Slimefun.Objects.Research;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem.State;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem.State;
|
||||||
import me.mrCookieSlime.Slimefun.Setup.Messages;
|
|
||||||
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem;
|
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem;
|
||||||
|
import me.mrCookieSlime.Slimefun.Setup.Messages;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides a few convenience methods.
|
* Provides a few convenience methods.
|
||||||
@ -27,23 +25,15 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem;
|
|||||||
*/
|
*/
|
||||||
public class Slimefun {
|
public class Slimefun {
|
||||||
|
|
||||||
public static Map<Integer, List<GuideHandler>> guideHandlers = new HashMap<>();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether EmeraldEnchants is enabled or not.
|
|
||||||
*/
|
|
||||||
public static boolean emeraldenchants = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lists all the registered categories.
|
* Lists all the registered categories.
|
||||||
*/
|
*/
|
||||||
public static List<Category> currentCategories = new ArrayList<>();
|
public static List<Category> currentCategories = new ArrayList<>();
|
||||||
|
|
||||||
public static void registerGuideHandler(GuideHandler handler) {
|
public static void registerGuideHandler(GuideHandler handler) {
|
||||||
List<GuideHandler> handlers = new ArrayList<>();
|
List<GuideHandler> handlers = SlimefunPlugin.getUtilities().guideHandlers.getOrDefault(handler.getTier(), new ArrayList<>());
|
||||||
if (guideHandlers.containsKey(handler.getTier())) handlers = guideHandlers.get(handler.getTier());
|
|
||||||
handlers.add(handler);
|
handlers.add(handler);
|
||||||
guideHandlers.put(handler.getTier(), handlers);
|
SlimefunPlugin.getUtilities().guideHandlers.put(handler.getTier(), handlers);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -335,20 +325,8 @@ public class Slimefun {
|
|||||||
addWikiPage(id, "https://github.com/TheBusyBiscuit/Slimefun4/wiki/" + page);
|
addWikiPage(id, "https://github.com/TheBusyBiscuit/Slimefun4/wiki/" + page);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether EmeraldEnchants is enabled or not.
|
|
||||||
* <p>
|
|
||||||
* It can be directly accessed by {@link #emeraldenchants}.
|
|
||||||
*
|
|
||||||
* @return <code>true</code> if EmeraldEnchants is enabled,
|
|
||||||
* <code>false</code> otherwise.
|
|
||||||
*/
|
|
||||||
public static boolean isEmeraldEnchantsInstalled() {
|
|
||||||
return emeraldenchants;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<GuideHandler> getGuideHandlers(int tier) {
|
public static List<GuideHandler> getGuideHandlers(int tier) {
|
||||||
return guideHandlers.containsKey(tier) ? guideHandlers.get(tier): new ArrayList<>();
|
return SlimefunPlugin.getUtilities().guideHandlers.getOrDefault(tier, new ArrayList<>());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getVersion() {
|
public static String getVersion() {
|
||||||
|
@ -149,7 +149,7 @@ public class EnergyNet extends Network {
|
|||||||
else {
|
else {
|
||||||
supply = supply + energy;
|
supply = supply + energy;
|
||||||
}
|
}
|
||||||
SlimefunPlugin.ticker.blockTimings.put(source, System.currentTimeMillis() - timestamp);
|
SlimefunPlugin.getTicker().blockTimings.put(source, System.currentTimeMillis() - timestamp);
|
||||||
}
|
}
|
||||||
|
|
||||||
input.removeAll(exploded);
|
input.removeAll(exploded);
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package me.mrCookieSlime.Slimefun.api.network;
|
package me.mrCookieSlime.Slimefun.api.network;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.logging.Level;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Queue;
|
import java.util.Queue;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
@ -11,6 +12,7 @@ import org.bukkit.Location;
|
|||||||
|
|
||||||
import me.mrCookieSlime.CSCoreLibPlugin.general.Particles.MC_1_13.ParticleEffect;
|
import me.mrCookieSlime.CSCoreLibPlugin.general.Particles.MC_1_13.ParticleEffect;
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
||||||
|
|
||||||
public abstract class Network {
|
public abstract class Network {
|
||||||
|
|
||||||
@ -159,8 +161,8 @@ public abstract class Network {
|
|||||||
for(Location l: connectedLocations) {
|
for(Location l: connectedLocations) {
|
||||||
try {
|
try {
|
||||||
ParticleEffect.REDSTONE.display(l.clone().add(0.5, 0.5, 0.5), 0, 0, 0, 1, 1);
|
ParticleEffect.REDSTONE.display(l.clone().add(0.5, 0.5, 0.5), 0, 0, 0, 1, 1);
|
||||||
} catch(Exception e) {
|
} catch(Exception x) {
|
||||||
e.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while playing Network Animation for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -161,7 +161,7 @@ public class SlimefunCommand implements CommandExecutor, Listener {
|
|||||||
}
|
}
|
||||||
else if (args[0].equalsIgnoreCase("timings")) {
|
else if (args[0].equalsIgnoreCase("timings")) {
|
||||||
if (sender.hasPermission("slimefun.command.timings")|| sender instanceof ConsoleCommandSender) {
|
if (sender.hasPermission("slimefun.command.timings")|| sender instanceof ConsoleCommandSender) {
|
||||||
SlimefunPlugin.ticker.info(sender);
|
SlimefunPlugin.getTicker().info(sender);
|
||||||
}
|
}
|
||||||
else Messages.local.sendTranslation(sender, "messages.no-permission", true);
|
else Messages.local.sendTranslation(sender, "messages.no-permission", true);
|
||||||
}
|
}
|
||||||
|
@ -68,7 +68,7 @@ public class PlaceholderAPIHook extends PlaceholderExpansion {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (params.equals("timings_lag")) {
|
if (params.equals("timings_lag")) {
|
||||||
return SlimefunPlugin.ticker.getTime() + "ms";
|
return SlimefunPlugin.getTicker().getTime() + "ms";
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
@ -7,6 +7,7 @@ import net.coreprotect.CoreProtectAPI;
|
|||||||
public final class SlimefunHooks {
|
public final class SlimefunHooks {
|
||||||
|
|
||||||
private boolean exoticGarden = false;
|
private boolean exoticGarden = false;
|
||||||
|
private boolean emeraldEnchants = false;
|
||||||
private boolean coreProtect = false;
|
private boolean coreProtect = false;
|
||||||
private boolean clearLag = false;
|
private boolean clearLag = false;
|
||||||
private boolean worldEdit = false;
|
private boolean worldEdit = false;
|
||||||
@ -27,6 +28,7 @@ public final class SlimefunHooks {
|
|||||||
}
|
}
|
||||||
|
|
||||||
exoticGarden = plugin.getServer().getPluginManager().isPluginEnabled("ExoticGarden"); // Had to do it this way, otherwise it seems disabled.
|
exoticGarden = plugin.getServer().getPluginManager().isPluginEnabled("ExoticGarden"); // Had to do it this way, otherwise it seems disabled.
|
||||||
|
emeraldEnchants = plugin.getServer().getPluginManager().isPluginEnabled("EmeraldEnchants");
|
||||||
|
|
||||||
if (plugin.getServer().getPluginManager().isPluginEnabled("CoreProtect")) {
|
if (plugin.getServer().getPluginManager().isPluginEnabled("CoreProtect")) {
|
||||||
coreProtectAPI = ((CoreProtect) plugin.getServer().getPluginManager().getPlugin("CoreProtect")).getAPI();
|
coreProtectAPI = ((CoreProtect) plugin.getServer().getPluginManager().getPlugin("CoreProtect")).getAPI();
|
||||||
@ -51,6 +53,10 @@ public final class SlimefunHooks {
|
|||||||
return exoticGarden;
|
return exoticGarden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isEmeraldEnchantsInstalled() {
|
||||||
|
return emeraldEnchants;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean isCoreProtectInstalled() {
|
public boolean isCoreProtectInstalled() {
|
||||||
return coreProtect;
|
return coreProtect;
|
||||||
}
|
}
|
||||||
|
@ -9,11 +9,13 @@ import java.net.URL;
|
|||||||
import java.net.URLConnection;
|
import java.net.URLConnection;
|
||||||
import java.nio.channels.Channels;
|
import java.nio.channels.Channels;
|
||||||
import java.nio.channels.ReadableByteChannel;
|
import java.nio.channels.ReadableByteChannel;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
|
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
||||||
|
|
||||||
public abstract class GitHubConnector {
|
public abstract class GitHubConnector {
|
||||||
|
|
||||||
@ -79,8 +81,8 @@ public abstract class GitHubConnector {
|
|||||||
JsonElement element = new JsonParser().parse(full);
|
JsonElement element = new JsonParser().parse(full);
|
||||||
this.onSuccess(element);
|
this.onSuccess(element);
|
||||||
}
|
}
|
||||||
catch (IOException e) {
|
catch (IOException x) {
|
||||||
e.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while parsing GitHub-Data for Slimefun " + Slimefun.getVersion(), x);
|
||||||
this.onFailure();
|
this.onFailure();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ package me.mrCookieSlime.Slimefun.hooks.github;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import com.google.gson.JsonArray;
|
import com.google.gson.JsonArray;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
@ -11,6 +12,7 @@ import com.google.gson.JsonParser;
|
|||||||
|
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunGuide;
|
import me.mrCookieSlime.Slimefun.SlimefunGuide;
|
||||||
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.Slimefun;
|
||||||
|
|
||||||
public final class GitHubSetup {
|
public final class GitHubSetup {
|
||||||
|
|
||||||
@ -73,14 +75,14 @@ public final class GitHubSetup {
|
|||||||
try {
|
try {
|
||||||
profileReader.close();
|
profileReader.close();
|
||||||
} catch (IOException x) {
|
} catch (IOException x) {
|
||||||
x.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while closing GitHub-Stream for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (sessionReader != null) {
|
if (sessionReader != null) {
|
||||||
try {
|
try {
|
||||||
sessionReader.close();
|
sessionReader.close();
|
||||||
} catch (IOException x) {
|
} catch (IOException x) {
|
||||||
x.printStackTrace();
|
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while closing GitHub-Stream for Slimefun " + Slimefun.getVersion(), x);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -159,7 +159,7 @@ public class DamageListener implements Listener {
|
|||||||
strippedItem.removeEnchantment(enchantment);
|
strippedItem.removeEnchantment(enchantment);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Slimefun.isEmeraldEnchantsInstalled()) {
|
if (SlimefunPlugin.getHooks().isEmeraldEnchantsInstalled()) {
|
||||||
for(ItemEnchantment enchantment : EmeraldEnchants.getInstance().getRegistry().getEnchantments(itemStack)){
|
for(ItemEnchantment enchantment : EmeraldEnchants.getInstance().getRegistry().getEnchantments(itemStack)){
|
||||||
EmeraldEnchants.getInstance().getRegistry().applyEnchantment(strippedItem, enchantment.getEnchantment(), 0);
|
EmeraldEnchants.getInstance().getRegistry().applyEnchantment(strippedItem, enchantment.getEnchantment(), 0);
|
||||||
}
|
}
|
||||||
|
@ -159,14 +159,14 @@ public class ItemListener implements Listener {
|
|||||||
if (BlockStorage.check(e.getClickedBlock()).isTicking()) {
|
if (BlockStorage.check(e.getClickedBlock()).isTicking()) {
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&2\u2714"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&2\u2714"));
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dAsync: &e" + (BlockStorage.check(e.getClickedBlock()).getBlockTicker().isSynchronized() ? "&4\u2718": "&2\u2714")));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dAsync: &e" + (BlockStorage.check(e.getClickedBlock()).getBlockTicker().isSynchronized() ? "&4\u2718": "&2\u2714")));
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock()) + "ms"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunPlugin.getTicker().getTimings(e.getClickedBlock()) + "ms"));
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTotal Timings: &e" + SlimefunPlugin.ticker.getTimings(BlockStorage.checkID(e.getClickedBlock())) + "ms"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTotal Timings: &e" + SlimefunPlugin.getTicker().getTimings(BlockStorage.checkID(e.getClickedBlock())) + "ms"));
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunPlugin.getTicker().getTimings(e.getClickedBlock().getChunk()) + "ms"));
|
||||||
}
|
}
|
||||||
else if (BlockStorage.check(e.getClickedBlock()).getEnergyTicker() != null) {
|
else if (BlockStorage.check(e.getClickedBlock()).getEnergyTicker() != null) {
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&b~ &3(Indirect)"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&b~ &3(Indirect)"));
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock()) + "ms"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dTimings: &e" + SlimefunPlugin.getTicker().getTimings(e.getClickedBlock()) + "ms"));
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunPlugin.ticker.getTimings(e.getClickedBlock().getChunk()) + "ms"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', " &dChunk Timings: &e" + SlimefunPlugin.getTicker().getTimings(e.getClickedBlock().getChunk()) + "ms"));
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&4\u2718"));
|
p.sendMessage(ChatColor.translateAlternateColorCodes('&', "&dTicking: " + "&4\u2718"));
|
||||||
|
@ -15,6 +15,7 @@ import org.bukkit.inventory.ItemStack;
|
|||||||
import me.mrCookieSlime.Slimefun.GEO.OreGenResource;
|
import me.mrCookieSlime.Slimefun.GEO.OreGenResource;
|
||||||
import me.mrCookieSlime.Slimefun.Setup.PostSlimefunLoadingHandler;
|
import me.mrCookieSlime.Slimefun.Setup.PostSlimefunLoadingHandler;
|
||||||
import me.mrCookieSlime.Slimefun.ancient_altar.AltarRecipe;
|
import me.mrCookieSlime.Slimefun.ancient_altar.AltarRecipe;
|
||||||
|
import me.mrCookieSlime.Slimefun.api.GuideHandler;
|
||||||
import me.mrCookieSlime.Slimefun.api.PlayerProfile;
|
import me.mrCookieSlime.Slimefun.api.PlayerProfile;
|
||||||
import me.mrCookieSlime.Slimefun.api.item_transport.CargoTransportEvent;
|
import me.mrCookieSlime.Slimefun.api.item_transport.CargoTransportEvent;
|
||||||
import me.mrCookieSlime.Slimefun.hooks.github.Contributor;
|
import me.mrCookieSlime.Slimefun.hooks.github.Contributor;
|
||||||
@ -34,6 +35,7 @@ public final class Utilities {
|
|||||||
|
|
||||||
public Map<UUID, PlayerProfile> profiles = new HashMap<>();
|
public Map<UUID, PlayerProfile> profiles = new HashMap<>();
|
||||||
|
|
||||||
|
public Map<Integer, List<GuideHandler>> guideHandlers = new HashMap<>();
|
||||||
public List<PostSlimefunLoadingHandler> postHandlers = new ArrayList<>();
|
public List<PostSlimefunLoadingHandler> postHandlers = new ArrayList<>();
|
||||||
|
|
||||||
public Map<UUID, Boolean> jumpState = new HashMap<>();
|
public Map<UUID, Boolean> jumpState = new HashMap<>();
|
||||||
|
Loading…
Reference in New Issue
Block a user