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

Reduced technical debt again

Browse Source
This commit is contained in:
TheBusyBiscuit 2019-08-27 23:08:13 +02:00
parent 204e61d3a5
commit 3ccf0722b6
17 changed files with 76 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/me/mrCookieSlime/Slimefun/Events/MultiBlockInteractEvent.java
View File

@ -12,10 +12,10 @@ public class MultiBlockInteractEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
Player p;
MultiBlock mb;
Block b;
boolean cancelled;
private Player p;
private MultiBlock mb;
private Block b;
private boolean cancelled;
public HandlerList getHandlers() {
return handlers;

6
src/me/mrCookieSlime/Slimefun/Events/ResearchUnlockEvent.java
View File

@ -11,9 +11,9 @@ public class ResearchUnlockEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList();
Player p;
Research r;
boolean cancelled;
private Player p;
private Research r;
private boolean cancelled;
public HandlerList getHandlers() {
return handlers;

8
src/me/mrCookieSlime/Slimefun/GEO/OreGenResource.java
View File

@ -6,15 +6,15 @@ import org.bukkit.inventory.ItemStack;
public interface OreGenResource {
// Returns the default supply of this resource in that biome
public int getDefaultSupply(Biome biome);
int getDefaultSupply(Biome biome);
// Name/ID e.g. "Oil"
public String getName();
String getName();
// For the GEO-Scanner
public ItemStack getIcon();
ItemStack getIcon();
// Measurement Unit e.g. "Buckets"
public String getMeasurementUnit();
String getMeasurementUnit();
}

11
src/me/mrCookieSlime/Slimefun/GEO/OreGenSystem.java
View File

@ -1,27 +1,24 @@
package me.mrCookieSlime.Slimefun.GEO;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import org.bukkit.Chunk;
import org.bukkit.block.Biome;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
public final class OreGenSystem {
private OreGenSystem() {}
public static Map<String, OreGenResource> map = new HashMap<>();
public static Collection<OreGenResource> listResources() {
return map.values();
return SlimefunStartup.instance.getUtilities().resources.values();
}
public static void registerResource(OreGenResource resource) {
map.put(resource.getName(), resource);
SlimefunStartup.instance.getUtilities().resources.put(resource.getName(), resource);
System.out.println("[Slimefun - GEO] Registering Ore Gen: " + resource.getName());
Config cfg = new Config("plugins/Slimefun/generators/" + resource.getName() + ".cfg");
@ -32,7 +29,7 @@ public final class OreGenSystem {
}
public static OreGenResource getResource(String name) {
return map.get(name);
return SlimefunStartup.instance.getUtilities().resources.get(name);
}
private static int getDefault(OreGenResource resource, Biome biome) {

8
src/me/mrCookieSlime/Slimefun/Setup/CSCoreLibLoader.java
View File

@ -19,10 +19,10 @@ import com.google.gson.JsonParser;
public class CSCoreLibLoader {
Plugin plugin;
URL url;
URL download;
File file;
private Plugin plugin;
private URL url;
private URL download;
private File file;
public CSCoreLibLoader(Plugin plugin) {
this.plugin = plugin;

4
src/me/mrCookieSlime/Slimefun/Setup/Files.java
View File

@ -2,7 +2,9 @@ package me.mrCookieSlime.Slimefun.Setup;
import java.io.File;
public class Files {
public final class Files {
private Files() {}
public static File RESEARCHES = new File("plugins/Slimefun/Researches.yml");
public static File CONFIG = new File("plugins/Slimefun/config.yml");

4
src/me/mrCookieSlime/Slimefun/Setup/Messages.java
View File

@ -2,7 +2,9 @@ package me.mrCookieSlime.Slimefun.Setup;
import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Localization;
public class Messages {
public final class Messages {
private Messages() {}
public static Localization local;

4
src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java
View File

@ -27,7 +27,9 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.machines.AutomatedCrafting
import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.api.SlimefunRecipes;
public class MiscSetup {
public final class MiscSetup {
private MiscSetup() {}
public static List<PostSlimefunLoadingHandler> post_handlers = new ArrayList<>();

4
src/me/mrCookieSlime/Slimefun/Setup/ResearchSetup.java
View File

@ -7,7 +7,9 @@ import me.mrCookieSlime.Slimefun.api.Slimefun;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
public class ResearchSetup {
public final class ResearchSetup {
private ResearchSetup() {}
public static void setupResearches() {
Slimefun.registerResearch(new Research(0, "Walking Sticks", 1), SlimefunItems.GRANDMAS_WALKING_STICK, SlimefunItems.GRANDPAS_WALKING_STICK);

8
src/me/mrCookieSlime/Slimefun/Setup/SlimefunManager.java
View File

@ -17,7 +17,9 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunArmorPiece;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.VanillaItem;
public class SlimefunManager {
public final class SlimefunManager {
private SlimefunManager() {}
public static SlimefunStartup plugin;
public static String PREFIX;
@ -26,7 +28,7 @@ public class SlimefunManager {
public static void registerArmorSet(ItemStack baseComponent, ItemStack[] items, String idSyntax, PotionEffect[][] effects, boolean special, boolean slimefun) {
String[] components = new String[] {"_HELMET", "_CHESTPLATE", "_LEGGINGS", "_BOOTS"};
Category cat = special ? Categories.MAGIC_ARMOR: Categories.ARMOR;
List<ItemStack[]> recipes = new ArrayList<ItemStack[]>();
List<ItemStack[]> recipes = new ArrayList<>();
recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, null, null, null});
recipes.add(new ItemStack[] {baseComponent, null, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent});
recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, baseComponent, null, baseComponent});
@ -40,7 +42,7 @@ public class SlimefunManager {
public static void registerArmorSet(ItemStack baseComponent, ItemStack[] items, String idSyntax, boolean slimefun, boolean vanilla) {
String[] components = new String[] {"_HELMET", "_CHESTPLATE", "_LEGGINGS", "_BOOTS"};
Category cat = Categories.ARMOR;
List<ItemStack[]> recipes = new ArrayList<ItemStack[]>();
List<ItemStack[]> recipes = new ArrayList<>();
recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, null, null, null});
recipes.add(new ItemStack[] {baseComponent, null, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent, baseComponent});
recipes.add(new ItemStack[] {baseComponent, baseComponent, baseComponent, baseComponent, null, baseComponent, baseComponent, null, baseComponent});

7
src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
View File

@ -161,7 +161,9 @@ import me.mrCookieSlime.Slimefun.holograms.Projector;
import me.mrCookieSlime.Slimefun.holograms.ReactorHologram;
import me.mrCookieSlime.Slimefun.listeners.AncientAltarListener;
public class SlimefunSetup {
public final class SlimefunSetup {
private SlimefunSetup() {}
public static void setupItems() {
new SlimefunItem(Categories.WEAPONS, SlimefunItems.GRANDMAS_WALKING_STICK, "GRANDMAS_WALKING_STICK", RecipeType.ENHANCED_CRAFTING_TABLE,
@ -554,13 +556,14 @@ public class SlimefunSetup {
new String[] {"chance.FLINT", "chance.CLAY", "chance.SIFTED_ORE"}, new Integer[] {47, 28, 15})
.register(true, new ItemInteractionHandler() {
private Random random = new Random();
@Override
public boolean onRightClick(ItemUseEvent e, Player p, ItemStack item) {
if (SlimefunManager.isItemSimiliar(item, SlimefunItems.GOLD_PAN, true)) {
if (e.getClickedBlock() != null && e.getClickedBlock().getType() == Material.GRAVEL) {
if (CSCoreLib.getLib().getProtectionManager().canBuild(p.getUniqueId(), e.getClickedBlock(), true)) {
List<ItemStack> drops = new ArrayList<>();
Random random = new Random();
if (random.nextInt(100) < (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.SIFTED_ORE")) drops.add(SlimefunItems.SIFTED_ORE);
else if (random.nextInt(100) < (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.CLAY")) drops.add(new ItemStack(Material.CLAY_BALL));

4
src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java
View File

@ -7,8 +7,10 @@ import me.mrCookieSlime.Slimefun.api.Slimefun;
*
* @since 4.1.2
*/
public class WikiSetup {
public final class WikiSetup {
private WikiSetup() {}
/**
* Setups the official Wiki links.
*/

11
src/me/mrCookieSlime/Slimefun/SlimefunGuide.java
View File

@ -53,12 +53,13 @@ import me.mrCookieSlime.Slimefun.api.Slimefun;
import me.mrCookieSlime.Slimefun.hooks.github.Contributor;
import me.mrCookieSlime.Slimefun.hooks.github.IntegerFormat;
public class SlimefunGuide {
public final class SlimefunGuide {
private SlimefunGuide() {}
public static Map<UUID, List<Object>> history = new HashMap<>();
public static int month = 0;
public static List<Contributor> contributors = new ArrayList<>();
public static int issues = 0;
public static int forks = 0;
/**
@ -163,7 +164,7 @@ public class SlimefunGuide {
});
}
menu.addItem(1, new CustomItem(new ItemStack(Material.WRITABLE_BOOK), "&aCredits", "", "&7Version: &a" + SlimefunStartup.instance.getDescription().getVersion(), "&7Contributors: &e" + contributors.size(), "", "&7\u21E8 Click to see the people behind this Plugin"));
menu.addItem(1, new CustomItem(new ItemStack(Material.WRITABLE_BOOK), "&aCredits", "", "&7Version: &a" + SlimefunStartup.instance.getDescription().getVersion(), "&7Contributors: &e" + SlimefunStartup.instance.getUtilities().contributors.size(), "", "&7\u21E8 Click to see the people behind this Plugin"));
menu.addMenuClickHandler(1, (pl, slot, item, action) -> {
openCredits(pl, guide);
return false;
@ -221,11 +222,11 @@ public class SlimefunGuide {
int index = 9;
double total = 0;
for (Contributor contributor : contributors) {
for (Contributor contributor : SlimefunStartup.instance.getUtilities().contributors) {
total += contributor.getCommits();
}
for (final Contributor contributor: contributors) {
for (final Contributor contributor: SlimefunStartup.instance.getUtilities().contributors) {
ItemStack skull = new ItemStack(Material.PLAYER_HEAD);
try {

6
src/me/mrCookieSlime/Slimefun/SlimefunStartup.java
View File

@ -436,15 +436,12 @@ public class SlimefunStartup extends JavaPlugin {
AContainer.processing = null;
AContainer.progress = null;
Slimefun.guide_handlers = null;
EnergyNet.listeners = null;
EnergyNet.machines_input = null;
EnergyNet.machines_output = null;
EnergyNet.machines_storage = null;
CargoNet.faces = null;
BlockStorage.universal_inventories = null;
TickerTask.block_timings = null;
OreGenSystem.map = null;
SlimefunGuide.contributors = null;
PlayerProfile.profiles = null;
OreWasher.items = null;
@ -455,8 +452,7 @@ public class SlimefunStartup extends JavaPlugin {
private void createDir(String path) {
File file = new File(path);
if (!file.exists())
file.mkdirs();
if (!file.exists()) file.mkdirs();
}
public static Config getCfg() {

5
src/me/mrCookieSlime/Slimefun/Utilities.java
View File

@ -12,8 +12,10 @@ import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import me.mrCookieSlime.Slimefun.GEO.OreGenResource;
import me.mrCookieSlime.Slimefun.ancient_altar.AltarRecipe;
import me.mrCookieSlime.Slimefun.api.item_transport.CargoTransportEvent;
import me.mrCookieSlime.Slimefun.hooks.github.Contributor;
import me.mrCookieSlime.Slimefun.hooks.github.GitHubConnector;
/**
@ -45,8 +47,11 @@ public final class Utilities {
public Set<UUID> elevatorUsers = new HashSet<>();
public Set<UUID> teleporterUsers = new HashSet<>();
public Map<String, OreGenResource> resources = new HashMap<>();
public Set<GitHubConnector> connectors = new HashSet<>();
public Map<String, String> contributorHeads = new HashMap<>();
public List<Contributor> contributors = new ArrayList<>();
public List<CargoTransportEvent> cargoTransportEvents = new ArrayList<>();

22
src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java
View File

@ -1,23 +1,21 @@
package me.mrCookieSlime.Slimefun.api.energy;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import me.mrCookieSlime.Slimefun.api.network.Network;
import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.TickerTask;
import me.mrCookieSlime.Slimefun.holograms.EnergyHologram;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import me.mrCookieSlime.CSCoreLibPlugin.general.Math.DoubleHandler;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
import me.mrCookieSlime.Slimefun.api.BlockStorage;
import me.mrCookieSlime.Slimefun.api.TickerTask;
import me.mrCookieSlime.Slimefun.api.network.Network;
import me.mrCookieSlime.Slimefun.holograms.EnergyHologram;
public class EnergyNet extends Network {
public enum NetworkComponent {
SOURCE,
@ -31,9 +29,7 @@ public class EnergyNet extends Network {
public static Set<String> machines_input = new HashSet<String>();
public static Set<String> machines_storage = new HashSet<String>();
public static Set<String> machines_output = new HashSet<String>();
public static Map<String, EnergyFlowListener> listeners = new HashMap<String, EnergyFlowListener>();
public static NetworkComponent getComponent(Block b) {
return getComponent(b.getLocation());
}

20
src/me/mrCookieSlime/Slimefun/hooks/github/GitHubSetup.java
View File

@ -12,14 +12,16 @@ import com.google.gson.JsonParser;
import me.mrCookieSlime.Slimefun.SlimefunGuide;
import me.mrCookieSlime.Slimefun.SlimefunStartup;
public class GitHubSetup {
public final class GitHubSetup {
private GitHubSetup() {}
public static void setup() {
new GitHubConnector() {
@Override
public void onSuccess(JsonElement element) {
SlimefunGuide.contributors.clear();
SlimefunStartup.instance.getUtilities().contributors.clear();
JsonArray array = element.getAsJsonArray();
for (int i = 0; i < array.size(); i++) {
@ -33,10 +35,10 @@ public class GitHubSetup {
if (!name.equals("invalid-email-address")) {
Contributor contributor = new Contributor(name, job, commits);
contributor.setProfile(profile);
SlimefunGuide.contributors.add(contributor);
SlimefunStartup.instance.getUtilities().contributors.add(contributor);
}
}
SlimefunGuide.contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0));
SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0));
SlimefunStartup.instance.getServer().getScheduler().runTaskAsynchronously(SlimefunStartup.instance, () -> {
for (JsonElement e: array) {
@ -87,10 +89,10 @@ public class GitHubSetup {
@Override
public void onFailure() {
SlimefunGuide.contributors.clear();
SlimefunGuide.contributors.add(new Contributor("TheBusyBiscuit", "&cAuthor", 3));
SlimefunGuide.contributors.add(new Contributor("John000708", "&cAuthor", 2));
SlimefunGuide.contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0));
SlimefunStartup.instance.getUtilities().contributors.clear();
SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("TheBusyBiscuit", "&cAuthor", 3));
SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("John000708", "&cAuthor", 2));
SlimefunStartup.instance.getUtilities().contributors.add(new Contributor("AquaLazuryt", "&6Lead Head Artist", 0));
}
@Override