diff --git a/pom.xml b/pom.xml index 1960b1e..a3128e1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 nl.hypothermic tekkitreference - 1.2.1-RELEASE + 1.3.0-RELEASE TekkitReference diff --git a/src/main/java/nl/hypothermic/tekkitreference/trCommandExecutor.java b/src/main/java/nl/hypothermic/tekkitreference/trCommandExecutor.java index c966f6a..fe92ca3 100644 --- a/src/main/java/nl/hypothermic/tekkitreference/trCommandExecutor.java +++ b/src/main/java/nl/hypothermic/tekkitreference/trCommandExecutor.java @@ -219,6 +219,9 @@ public void run() { try { String icholdeu = null; String rprequirebt = null; String passsun = null; + String eeemcs = null; + String eeemcstor = null; + String eeemcbonus = null; while (rs.next()) { name = rs.getString("name"); id = rs.getString("id"); @@ -236,6 +239,9 @@ public void run() { try { icholdeu = rs.getString("icholdeu"); rprequirebt = rs.getString("rprequirebt"); passsun = rs.getString("passsun"); + eeemcs = rs.getString("eeemcs"); + eeemcstor = rs.getString("eeemcstor"); + eeemcbonus = rs.getString("eeemcbonus"); } if (name == null) { sender.sendMessage(ChatColor.GREEN + "" + ChatColor.BOLD + "[REF]" + ChatColor.RESET + ChatColor.WHITE + " Could not find that item in the database."); @@ -293,6 +299,17 @@ public void run() { try { sender.sendMessage(ChatColor.DARK_PURPLE + "- " + "Does not use EU"); } } + } else if (type.toLowerCase().contains("Collector".toLowerCase())) { + if (eeemcs != null) { + sender.sendMessage(ChatColor.DARK_PURPLE + "- " + "Generates max. " + eeemcs + " EMC/s"); + } + } else if (type.toLowerCase().contains("Relay".toLowerCase())) { + if (eeemcstor != null) { + sender.sendMessage(ChatColor.DARK_PURPLE + "- " + "Stores max. " + eeemcstor + " EMC"); + } + if (eeemcbonus != null) { + sender.sendMessage(ChatColor.DARK_PURPLE + "- " + "Gives " + eeemcbonus + " EMC bonus per attached side."); + } } } else if (xfilter == 1) { sender.sendMessage(ChatColor.GREEN + "" + ChatColor.BOLD + "[REF] " + ChatColor.RESET + ChatColor.WHITE + name + " (" + id + ")" + ChatColor.BLUE + " [" + xemc + " EMC]"); @@ -360,6 +377,24 @@ public void run() { try { } else { sender.sendMessage(ChatColor.GRAY + "- Sunlight can't pass through block"); }} catch (NullPointerException x) {} + try { + if (eeemcs != null) { + sender.sendMessage(ChatColor.DARK_PURPLE + "- " + "Generates max. " + eeemcs + " EMC/s"); + } else { + sender.sendMessage(ChatColor.GRAY + "- " + "Does not generate EMC"); + }} catch (NullPointerException x) {} + try { + if (eeemcstor != null) { + sender.sendMessage(ChatColor.DARK_PURPLE + "- " + "Stores max. " + eeemcstor + " EMC"); + } else { + sender.sendMessage(ChatColor.GRAY + "- " + "Does not store EMC"); + }} catch (NullPointerException x) {} + try { + if (eeemcbonus != null) { + sender.sendMessage(ChatColor.DARK_PURPLE + "- " + "Gives " + eeemcbonus + " EMC bonus per attached side."); + } else { + sender.sendMessage(ChatColor.GRAY + "- " + "Does not give an EMC bonus"); + }} catch (NullPointerException x) {} } return; } catch (Exception x) {} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8385d2c..5842c90 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: TekkitReference main: nl.hypothermic.tekkitreference.trMain -version: 1.2.1-RELEASE +version: 1.3.0-RELEASE author: hypothermicdotnl commands: ref: