Fixed some stuff

Author: Chocolateghasts

src/main/java/com/mewo/hbmenhanced/ResearchBlock/Research.java

@@ -18,11 +18,7 @@
 import java.util.Map;
 
 // TODO: Research May Produce Waste Or Fail Research
-// TODO: Tier 1 May Only Research Low Level Items
-// TODO: Make researchers only research materials, not other items
 // TODO: Make researchers give boosts to items from the previous tier
-// TODO: Make research take longer, but more rewarding
-// TODO: Make research repeatable, but not overpowered
 // TODO: Try to keep research fun instead of a chore
 
 public class Research {
@@ -40,7 +36,6 @@ public void Tier1(TileEntityT1 te) {
         ItemStack fuel = inventory[fuelSlot];
 
         if (output != null) {
-            // output blocked -> stop burning/researching
             te.isResearching = false;
             te.isBurning = false;
             return;
@@ -53,8 +48,8 @@ public void Tier1(TileEntityT1 te) {
             te.isBurning = false;
             return;
         }
+        if (!ResearchRegistry.canResearch(input.getItem(), 1)) return;
 
-        // start preparing research time only when we haven't started progress yet
         if (!te.isResearching || te.researchProgress == 0 && te.maxResearchProgress == 0) {
             MaterialInfo info = ResearchRegistry.getInfo(input.getItem());
             if (info != null) {
@@ -90,7 +85,7 @@ public void Tier1(TileEntityT1 te) {
                 fuel.stackSize--;
                 inventory[fuelSlot] = (fuel.stackSize <= 0) ? null : fuel;
             } else {
-                // not valid fuel - don't consume
+
             }
         }
 
@@ -150,6 +145,7 @@ public void Tier2(TileEntityT2 te) {
             te.isResearching = false;
             return;
         }
+        if (!ResearchRegistry.canResearch(input.getItem(), 1)) return;
 
         // constants for clarity
         final int fluidCost = 1000; // ml / units used to start a research cycle
@@ -246,6 +242,7 @@ public void Tier3(TileEntityT3 te) {
             return;
         }
 
+        if (!ResearchRegistry.canResearch(input.getItem(), 1)) return;
         final int powerPerTick = te.core.getPowerUsage(250);
 
         // start research (don't subtract per-tick energy here)

src/main/java/com/mewo/hbmenhanced/Util/ResearchUtil/ResearchRegistry.java

@@ -32,7 +32,8 @@ public static void init() {
     public static boolean canResearch(Item item, int tier) {
         MaterialInfo info = itemMaterialInfoMap.get(item);
         if (info == null) return false;
-
+        if (ResearchItemUtil.getResearchPoints(info) == null) return false;
+        if (info.type == MaterialType.UNKNOWN) return false;
         switch (tier) {
             case 1:
                 return info.rarity.rank() < MaterialRarity.RARE.rank();