Metrics

- New metrics for slimefun/emc2
Sefiraat · Jun 8, 2021 · 61ae59c · 61ae59c
1 parent 0983445
commit 61ae59c
Show file tree

Hide file tree

Showing 17 changed files with 82 additions and 9 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.github.sefiraat</groupId>
   <artifactId>EquivalencyTech</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.4</version>
   <build>
     <plugins>
       <plugin>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.sefiraat</groupId>
     <artifactId>EquivalencyTech</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.4</version>
 
     <build>
         <plugins>

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java b/src/main/java/io/github/sefiraat/equivalencytech/EquivalencyTech.java
@@ -10,6 +10,7 @@
 import io.github.sefiraat.equivalencytech.recipes.Recipes;
 import io.github.sefiraat.equivalencytech.runnables.ManagerRunnables;
 import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
@@ -91,16 +92,18 @@ public void onEnable() {
         configMainClass = new ConfigMain(this.getInstance());
         eqItems = new EQItems(this.getInstance());
         emcDefinitions = new EmcDefinitions(this.getInstance());
+        managerSupportedPlugins = new ManagerSupportedPlugins(this.getInstance());
         recipes = new Recipes(this.getInstance());
         managerEvents = new ManagerEvents(this.getInstance());
         managerRunnables = new ManagerRunnables(this.getInstance());
-        managerSupportedPlugins = new ManagerSupportedPlugins(this.getInstance());
 
         registerCommands();
 
         if (!isUnitTest) {
             int pluginId = 11527;
             Metrics metrics = new Metrics(this, pluginId);
+            metrics.addCustomChart(new SimplePie("slimefun", () -> String.valueOf(getManagerSupportedPlugins().isInstalledSlimefun())));
+            metrics.addCustomChart(new SimplePie("emc2", () -> String.valueOf(getManagerSupportedPlugins().isInstalledEMC2())));
         }
 
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/AeternalisFuel.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/AeternalisFuel.java
@@ -44,6 +44,7 @@ public AeternalisFuel(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"COAL3");
         ContainerStorage.makeAeternalisFuel(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/AlchemicalCoal.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/AlchemicalCoal.java
@@ -45,6 +45,7 @@ public AlchemicalCoal(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"COAL1");
         ContainerStorage.makeAlchemicalCoal(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/CondensatorChest.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/CondensatorChest.java
@@ -45,6 +45,7 @@ public CondensatorChest(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"CCHEST");
         ContainerStorage.makeConChest(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/DarkMatter.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/DarkMatter.java
@@ -45,6 +45,7 @@ public DarkMatter(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"DMATTER");
         ContainerStorage.makeDarkMatter(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
     }

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/DissolutionChest.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/DissolutionChest.java
@@ -43,6 +43,7 @@ public DissolutionChest(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"DCHEST");
         ContainerStorage.makeDisChest(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/MobiusFuel.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/MobiusFuel.java
@@ -45,6 +45,7 @@ public MobiusFuel(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"COAL2");
         ContainerStorage.makeMobiusFuel(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/RedMatter.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/RedMatter.java
@@ -45,6 +45,7 @@ public RedMatter(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"RMATTER");
         ContainerStorage.makeRedMatter(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/item/builders/TransmutationOrb.java b/src/main/java/io/github/sefiraat/equivalencytech/item/builders/TransmutationOrb.java
@@ -47,6 +47,7 @@ public TransmutationOrb(EquivalencyTech plugin) {
         im.setLore(lore);
         item.setItemMeta(im);
 
+        ContainerStorage.setItemID(item, plugin,"TORB");
         ContainerStorage.makeTransmutationOrb(item, plugin);
         ContainerStorage.makeCraftable(item, plugin);
 

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/listeners/BlockPlaceListener.java b/src/main/java/io/github/sefiraat/equivalencytech/listeners/BlockPlaceListener.java
@@ -0,0 +1,27 @@
+package io.github.sefiraat.equivalencytech.listeners;
+
+import io.github.sefiraat.equivalencytech.EquivalencyTech;
+import io.github.sefiraat.equivalencytech.statics.ContainerStorage;
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockPlaceEvent;
+
+public class BlockPlaceListener implements Listener {
+
+    private final EquivalencyTech plugin;
+
+    public BlockPlaceListener(EquivalencyTech plugin) {
+        this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onChestPlace(BlockPlaceEvent e) {
+        if (ContainerStorage.isCraftable(e.getItemInHand(), plugin) && e.getItemInHand().getType() != Material.CHEST) {
+            e.setCancelled(true);
+        }
+    }
+
+}
diff --git a/src/main/java/io/github/sefiraat/equivalencytech/listeners/ChestPlaceListener.java b/src/main/java/io/github/sefiraat/equivalencytech/listeners/ChestPlaceListener.java
@@ -10,7 +10,6 @@
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.Chest;
-import org.bukkit.entity.Item;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
@@ -35,7 +34,7 @@ public ChestPlaceListener(EquivalencyTech plugin) {
         plugin.getServer().getPluginManager().registerEvents(this, plugin);
     }
 
-    @EventHandler(priority = EventPriority.LOWEST)
+    @EventHandler(priority = EventPriority.LOW)
     public void onChestPlace(BlockPlaceEvent e) {
         if (e.getBlockPlaced().getType() == Material.CHEST) {
             boolean isDis = isDis(e);

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java b/src/main/java/io/github/sefiraat/equivalencytech/listeners/CraftListener.java
@@ -39,7 +39,10 @@ public void onPreCraft(PrepareItemCraftEvent e) {
                 contentLayer.add(clone);
             }
 
-            if (contentLayer.equals(Recipes.recipeCoal2Check(plugin))) {
+            if (contentLayer.equals(Recipes.recipeCoal1Check())) {
+                e.getInventory().setResult(plugin.getEqItems().getAlchemicalCoal().getItemClone());
+
+            } else if (contentLayer.equals(Recipes.recipeCoal2Check(plugin))) {
                 e.getInventory().setResult(plugin.getEqItems().getMobiusFuel().getItemClone());
 
             } else if (contentLayer.equals(Recipes.recipeCoal3Check(plugin))) {

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/listeners/ManagerEvents.java b/src/main/java/io/github/sefiraat/equivalencytech/listeners/ManagerEvents.java
@@ -8,6 +8,7 @@ public class ManagerEvents {
     private final CraftListener craftListener;
     private final PlayerJoinListener playerJoinListener;
     private final ChestPlaceListener chestPlaceListener;
+    private final BlockPlaceListener blockPlaceListener;
 
     public OrbOpenListener getOrbOpenListener() {
         return orbOpenListener;
@@ -25,11 +26,16 @@ public PlayerJoinListener getPlayerJoinListener() {
         return playerJoinListener;
     }
 
+    public BlockPlaceListener getBlockPlaceListener() {
+        return blockPlaceListener;
+    }
+
     public ManagerEvents(EquivalencyTech plugin) {
         orbOpenListener = new OrbOpenListener(plugin);
         craftListener = new CraftListener(plugin);
         playerJoinListener = new PlayerJoinListener(plugin);
         chestPlaceListener = new ChestPlaceListener(plugin);
+        blockPlaceListener = new BlockPlaceListener(plugin);
     }
 
 }
diff --git a/src/main/java/io/github/sefiraat/equivalencytech/statics/ContainerStorage.java b/src/main/java/io/github/sefiraat/equivalencytech/statics/ContainerStorage.java
@@ -6,11 +6,13 @@
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
 public final class ContainerStorage {
 
+    public static final String CS_ID = "id";
     public static final String CS_IS_TRANSMUTATION_ORB = "is_orb";
     public static final String CS_IS_CRAFTING = "is_craft";
     public static final String CS_IS_COAL_1 = "is_coal_1";
@@ -30,6 +32,7 @@ public static boolean containerHasData(ItemStack i, NamespacedKey key, Persisten
         return false;
     }
 
+    @Nullable
     public static Integer getDataInteger(ItemStack i, NamespacedKey key) {
         if (i.hasItemMeta()) {
             ItemMeta im = i.getItemMeta();
@@ -38,9 +41,10 @@ public static Integer getDataInteger(ItemStack i, NamespacedKey key) {
                 return Objects.requireNonNull(i.getItemMeta().getPersistentDataContainer().get(key, PersistentDataType.INTEGER));
             }
         }
-        return 0;
+        return null;
     }
 
+    @Nullable
     public static Long getDataLong(ItemStack i, NamespacedKey key) {
         if (i.hasItemMeta()) {
             ItemMeta im = i.getItemMeta();
@@ -49,7 +53,19 @@ public static Long getDataLong(ItemStack i, NamespacedKey key) {
                 return Objects.requireNonNull(i.getItemMeta().getPersistentDataContainer().get(key, PersistentDataType.LONG));
             }
         }
-        return 0L;
+        return null;
+    }
+
+    @Nullable
+    public static String getDataString(ItemStack i, NamespacedKey key) {
+        if (i.hasItemMeta()) {
+            ItemMeta im = i.getItemMeta();
+            assert im != null;
+            if (im.getPersistentDataContainer().has(key, PersistentDataType.STRING)) {
+                return Objects.requireNonNull(i.getItemMeta().getPersistentDataContainer().get(key, PersistentDataType.STRING));
+            }
+        }
+        return null;
     }
 
     public static void setData(ItemStack i, NamespacedKey key, int value) {
@@ -92,6 +108,17 @@ public static void removeData(ItemStack i, NamespacedKey key) {
         }
     }
 
+    public static void setItemID(ItemStack i, EquivalencyTech plugin, String string) {
+        NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_ID);
+        setData(i, key, string);
+    }
+
+    @Nullable
+    public static String getItemID(ItemStack i, EquivalencyTech plugin) {
+        NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_ID);
+        return getDataString(i, key);
+    }
+
     public static boolean isTransmutationOrb(ItemStack i, EquivalencyTech plugin) {
         NamespacedKey key = new NamespacedKey(plugin.getInstance(), CS_IS_TRANSMUTATION_ORB);
         return containerHasData(i, key, PersistentDataType.INTEGER);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: EquivalencyTech
-version: 1.1.2
+version: 1.1.4
 main: io.github.sefiraat.equivalencytech.EquivalencyTech
 api-version: 1.16
 softdepend: