1.17

Sefiraat · Jun 15, 2021 · ab245b3 · ab245b3
1 parent 61ae59c
commit ab245b3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 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.4</version>
+  <version>1.1.5-SNAPSHOT</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.4</version>
+    <version>1.1.5-SNAPSHOT</version>
 
     <build>
         <plugins>

diff --git a/src/main/java/io/github/sefiraat/equivalencytech/recipes/EmcDefinitions.java b/src/main/java/io/github/sefiraat/equivalencytech/recipes/EmcDefinitions.java
@@ -43,10 +43,11 @@ public EmcDefinitions(EquivalencyTech plugin) {
     private void fillBase(EquivalencyTech plugin) {
         Map<String, Double> h = plugin.getConfigMainClass().getEmc().getEmcBaseValues();
         for (Map.Entry<String, Double> entry : h.entrySet()) {
-            if (entry.getValue() > 0) {
-                emcBase.put(Material.matchMaterial(entry.getKey()), entry.getValue());
-                DebugLogs.logEmcBaseValueLoaded(plugin, entry.getKey(), entry.getValue());
+            if (Material.matchMaterial(entry.getKey()) == null) {
+                continue;
             }
+            emcBase.put(Material.matchMaterial(entry.getKey()), entry.getValue());
+            DebugLogs.logEmcBaseValueLoaded(plugin, entry.getKey(), entry.getValue());
         }
     }
 
@@ -145,7 +146,11 @@ private Double getEmcValue(EquivalencyTech plugin, ItemStack i, Integer nestLeve
         if (emcBase.containsKey(m)) {
             // Item is in the base list (config.yml) draw from there first
             DebugLogs.logEmcIsBase(plugin, eVal, nestLevel);
-            return emcBase.get(m);
+            if (emcBase.get(m) == 0) {
+                return null;
+            } else {
+                return emcBase.get(m);
+            }
         } else if (emcExtended.containsKey(m)) {
             // Item is in the extended list (already registered during fillExtended)
             DebugLogs.logEmcIsRegisteredExtended(plugin, eVal, nestLevel);

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -234,6 +234,11 @@ EMC_VALUES:
     BLACKSTONE: 2
     GILDED_BLACKSTONE: 16
     HONEY_BOTTLE: 1
+    PLAYER_HEAD: 0
+    RAW_IRON: 32
+    RAW_GOLD: 64
+    RAW_COPPER: 16
+    COPPER_INGOT: 32
 MESSAGES:
   COMMAND_SUBCOMMAND: "Please select a valid sub command"
   COMMAND_SELECT_ITEM: "Please select an item type"

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