mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Logger Conversion Pt.1

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-08-31 12:12:38 +02:00
parent e78e749e94
commit c293605312
15 changed files with 65 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/me/mrCookieSlime/Slimefun/GPS/GPSNetwork.java
View File

@ -5,6 +5,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -92,8 +93,8 @@ public class GPSNetwork {
menu.addMenuClickHandler(6, (pl, slot, item, action) -> {
try {
openWaypointControlPanel(pl);
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while opening the 'Waypoint' Panel for Slimefun " + Slimefun.getVersion(), x);
}
return false;
});
@ -104,9 +105,7 @@ public class GPSNetwork {
int slot = inventory[index];
menu.addItem(slot, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBjOWMxYTAyMmY0MGI3M2YxNGI0Y2JhMzdjNzE4YzZhNTMzZjNhMjg2NGI2NTM2ZDVmNDU2OTM0Y2MxZiJ9fX0="), "&bGPS Transmitter", "&8\u21E8 &7World: &r" + l.getWorld().getName(), "&8\u21E8 &7X: &r" + l.getX(), "&8\u21E8 &7Y: &r" + l.getY(), "&8\u21E8 &7Z: &r" + l.getZ(), "", "&8\u21E8 &7Signal Strength: &r" + l.getBlockY(), "&8\u21E8 &7Ping: &r" + DoubleHandler.fixDouble(1000D / l.getY()) + "ms"));
menu.addMenuClickHandler(slot,
(pl, slotn, item, action) -> false
);
menu.addMenuClickHandler(slot, (pl, slotn, item, action) -> false);
index++;
}
@ -135,17 +134,15 @@ public class GPSNetwork {
ChestMenu menu = new ChestMenu("&9Control Panel");
for (int slot: border) {
menu.addItem(slot, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "),
(pl, slotn, item, action) -> false
);
menu.addItem(slot, new CustomItem(new ItemStack(Material.GRAY_STAINED_GLASS_PANE), " "), (pl, slotn, item, action) -> false);
}
menu.addItem(2, new CustomItem(CustomSkull.getItem("eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBjOWMxYTAyMmY0MGI3M2YxNGI0Y2JhMzdjNzE4YzZhNTMzZjNhMjg2NGI2NTM2ZDVmNDU2OTM0Y2MxZiJ9fX0="), "&7Transmitter Overview &r(Select)"));
menu.addMenuClickHandler(2, (pl, slot, item, action) -> {
try {
openTransmitterControlPanel(pl);
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while opening the 'GPS Transmitters' Panel for Slimefun " + Slimefun.getVersion(), x);
}
return false;
});
@ -173,8 +170,8 @@ public class GPSNetwork {
pl.playSound(pl.getLocation(), Sound.UI_BUTTON_CLICK, 1F, 1F);
try {
openWaypointControlPanel(pl);
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while opening the 'Waypoint Control' Panel for Slimefun " + Slimefun.getVersion(), x);
}
return false;
});
@ -239,9 +236,7 @@ public class GPSNetwork {
for (OreGenResource resource: OreGenSystem.listResources()) {
int supply = OreGenSystem.getSupplies(resource, chunk, true);
menu.addItem(index, new CustomItem(resource.getIcon(), "&7Resource: &e" + resource.getName(), "", "&7Scanned Chunk:", "&8\u21E8 &7X: " + chunk.getX() + " Z: " + chunk.getZ(), "", "&7Result: &e" + supply + " " + resource.getMeasurementUnit()),
(pl, slot, item, action) -> false
);
menu.addItem(index, new CustomItem(resource.getIcon(), "&7Resource: &e" + resource.getName(), "", "&7Scanned Chunk:", "&8\u21E8 &7X: " + chunk.getX() + " Z: " + chunk.getZ(), "", "&7Result: &e" + supply + " " + resource.getMeasurementUnit()), (pl, slot, item, action) -> false);
index++;
}

8
src/me/mrCookieSlime/Slimefun/GPS/TeleportationSequence.java
View File

@ -1,6 +1,7 @@
package me.mrCookieSlime.Slimefun.GPS;
import java.util.UUID;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -14,6 +15,7 @@ import org.bukkit.potion.PotionEffectType;
import me.mrCookieSlime.CSCoreLibPlugin.general.World.TitleBuilder;
import me.mrCookieSlime.CSCoreLibPlugin.general.World.TitleBuilder.TitleType;
import me.mrCookieSlime.Slimefun.SlimefunPlugin;
import me.mrCookieSlime.Slimefun.api.Slimefun;
public final class TeleportationSequence {
@ -58,7 +60,7 @@ public final class TeleportationSequence {
title.send(TitleType.TITLE, p);
subtitle.send(TitleType.SUBTITLE, p);
} catch(Exception x) {
x.printStackTrace();
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while cancelling a Teleportation Sequence for Slimefun " + Slimefun.getVersion(), x);
}
}
}
@ -97,8 +99,8 @@ public final class TeleportationSequence {
Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunPlugin.instance, () -> updateProgress(uuid, speed, progress + speed, source, destination, resistance), 10L);
}
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured during a Teleportation Sequence for Slimefun " + Slimefun.getVersion(), x);
}
}
else cancel(uuid, p);

5
src/me/mrCookieSlime/Slimefun/Lists/Categories.java
View File

@ -1,5 +1,7 @@
package me.mrCookieSlime.Slimefun.Lists;
import java.util.logging.Level;
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
@ -10,6 +12,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull;
import me.mrCookieSlime.Slimefun.Objects.Category;
import me.mrCookieSlime.Slimefun.Objects.LockedCategory;
import me.mrCookieSlime.Slimefun.Objects.SeasonalCategory;
import me.mrCookieSlime.Slimefun.api.Slimefun;
/**
* Built-in categories.
@ -52,7 +55,7 @@ public final class Categories {
return CustomSkull.getItem(texture);
}
catch(Exception x) {
x.printStackTrace();
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while initializing the Categories for Slimefun " + Slimefun.getVersion(), x);
return new ItemStack(Material.PLAYER_HEAD);
}

4
src/me/mrCookieSlime/Slimefun/Lists/SlimefunItems.java
View File

@ -2,6 +2,7 @@ package me.mrCookieSlime.Slimefun.Lists;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import org.bukkit.ChatColor;
import org.bukkit.Color;
@ -19,6 +20,7 @@ import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomItem;
import me.mrCookieSlime.CSCoreLibPlugin.general.Inventory.Item.CustomPotion;
import me.mrCookieSlime.CSCoreLibPlugin.general.String.Christmas;
import me.mrCookieSlime.CSCoreLibPlugin.general.World.CustomSkull;
import me.mrCookieSlime.Slimefun.api.Slimefun;
public final class SlimefunItems {
@ -771,7 +773,7 @@ public final class SlimefunItems {
return CustomSkull.getItem(texture);
}
catch(Exception x) {
x.printStackTrace();
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while initializing the Items for Slimefun " + Slimefun.getVersion(), x);
return new ItemStack(Material.PLAYER_HEAD);
}

4
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java
View File

@ -7,6 +7,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -264,8 +265,7 @@ public class SlimefunItem {
else this.state = State.DISABLED;
}
} catch(Exception x) {
System.err.println("[Slimefun] Item Registration failed: " + this.id);
x.printStackTrace();
Slimefun.getLogger().log(Level.WARNING, "Registering the Item '" + id + "' for Slimefun " + Slimefun.getVersion() + " has failed", x);
}
}

7
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AdvancedCargoOutputNode.java
View File

@ -1,5 +1,7 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import java.util.logging.Level;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
@ -19,6 +21,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
import me.mrCookieSlime.Slimefun.Setup.Messages;
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.BlockMenuPreset;
import me.mrCookieSlime.Slimefun.api.item_transport.CargoNet;
@ -144,8 +147,8 @@ public class AdvancedCargoOutputNode extends SlimefunItem {
return false;
});
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while creating the Inventory of an Advanced Cargo Output Node for Slimefun " + Slimefun.getVersion(), x);
}
}

7
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AnimalGrowthAccelerator.java
View File

@ -1,5 +1,7 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import java.util.logging.Level;
import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.block.Block;
@ -22,6 +24,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
@ -97,8 +100,8 @@ public class AnimalGrowthAccelerator extends SlimefunItem {
public void tick(Block b, SlimefunItem sf, Config data) {
try {
AnimalGrowthAccelerator.this.tick(b);
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while ticking an Animal Growth Accelerator for Slimefun " + Slimefun.getVersion(), x);
}
}

7
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoBreeder.java
View File

@ -1,5 +1,7 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import java.util.logging.Level;
import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.block.Block;
@ -22,6 +24,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
@ -95,8 +98,8 @@ public class AutoBreeder extends SlimefunItem {
public void tick(Block b, SlimefunItem sf, Config data) {
try {
AutoBreeder.this.tick(b);
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while ticking an Auto Breeder for Slimefun " + Slimefun.getVersion(), x);
}
}

6
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/CropGrowthAccelerator.java
View File

@ -2,6 +2,7 @@ package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import java.util.EnumMap;
import java.util.Map;
import java.util.logging.Level;
import org.bukkit.Material;
import org.bukkit.Particle;
@ -23,6 +24,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
import me.mrCookieSlime.Slimefun.Setup.SlimefunManager;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
@ -108,8 +110,8 @@ public abstract class CropGrowthAccelerator extends SlimefunItem {
public void tick(Block b, SlimefunItem sf, Config data) {
try {
CropGrowthAccelerator.this.tick(b);
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while ticking a Crop Growth Accelerator for Slimefun " + Slimefun.getVersion(), x);
}
}

6
src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/XPCollector.java
View File

@ -1,6 +1,7 @@
package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines;
import java.util.Iterator;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.Material;
@ -21,6 +22,7 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.UnregisterReason;
import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.api.energy.ChargableBlock;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
@ -126,8 +128,8 @@ public class XPCollector extends SlimefunItem {
public void tick(Block b, SlimefunItem sf, Config data) {
try {
XPCollector.this.tick(b);
} catch (Exception e) {
e.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while ticking an Exp Collector for Slimefun " + Slimefun.getVersion(), x);
}
}

5
src/me/mrCookieSlime/Slimefun/api/ErrorReport.java
View File

@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.logging.Level;
import java.util.stream.IntStream;
import org.bukkit.Bukkit;
@ -86,8 +87,8 @@ public class ErrorReport {
System.err.println("[Slimefun] Please consider sending this File to the developer(s) of Slimefun, this message does not have to be included.");
System.err.println("[Slimefun] You can put the file on Pastebin and then post it here: https://github.com/TheBusyBiscuit/Slimefun4/issues");
System.err.println("[Slimefun] ");
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (FileNotFoundException x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while saving an Error-Report for Slimefun " + Slimefun.getVersion(), x);
}
}

4
src/me/mrCookieSlime/Slimefun/api/Slimefun.java
View File

@ -350,4 +350,8 @@ public class Slimefun {
public static List<GuideHandler> getGuideHandlers(int tier) {
return guideHandlers.containsKey(tier) ? guideHandlers.get(tier): new ArrayList<>();
}
public static String getVersion() {
return SlimefunPlugin.instance.getDescription().getVersion();
}
}

5
src/me/mrCookieSlime/Slimefun/api/SlimefunBackup.java
View File

@ -10,6 +10,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.logging.Level;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@ -108,8 +109,8 @@ public class SlimefunBackup {
}
System.out.println("[Slimefun] Backed up Blocks to " + file.getName());
} catch(IOException e) {
e.printStackTrace();
} catch(IOException x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while creating a World-Backup for Slimefun " + Slimefun.getVersion(), x);
}
}

7
src/me/mrCookieSlime/Slimefun/hooks/github/IntegerFormat.java
View File

@ -5,6 +5,9 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
import java.util.logging.Level;
import me.mrCookieSlime.Slimefun.api.Slimefun;
public final class IntegerFormat {
@ -17,8 +20,8 @@ public final class IntegerFormat {
public static Date parseGitHubDate(String str) {
try {
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(str.replace("T", " ").replace("Z", ""));
} catch (ParseException e) {
e.printStackTrace();
} catch (ParseException x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while parsing a GitHub-Date for Slimefun " + Slimefun.getVersion(), x);
return null;
}
}

5
src/me/mrCookieSlime/Slimefun/listeners/ItemListener.java
View File

@ -1,6 +1,7 @@
package me.mrCookieSlime.Slimefun.listeners;
import java.util.List;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@ -137,8 +138,8 @@ public class ItemListener implements Listener {
b.setType(Material.PLAYER_HEAD);
try {
CustomSkull.setSkull(b, "eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvZTllYjlkYTI2Y2YyZDMzNDEzOTdhN2Y0OTEzYmEzZDM3ZDFhZDEwZWFlMzBhYjI1ZmEzOWNlYjg0YmMifX19");
} catch (Exception e1) {
e1.printStackTrace();
} catch (Exception x) {
Slimefun.getLogger().log(Level.SEVERE, "An Error occured while using the Debug-Fish for Slimefun " + Slimefun.getVersion(), x);
}
}
else if (BlockStorage.hasBlockInfo(e.getClickedBlock())) {