New version, some fixes, added shape

6 files changed, 49 insertions, 4 deletions

diff --git a/src/main/java/com/detrav/DetravLoader.java b/src/main/java/com/detrav/DetravLoader.java
index ce6482d588..2254ecfe88 100644
--- a/src/main/java/com/detrav/DetravLoader.java
+++ b/src/main/java/com/detrav/DetravLoader.java
@@ -2,6 +2,7 @@ package com.detrav;
 
 import com.detrav.items.DetravMetaGeneratedItem01;
 import com.detrav.items.DetravMetaGeneratedTool01;
+import com.detrav.tools.ProcessingDetravShaping;
 import com.detrav.tools.ProcessingDetravToolProPick;
 
 /**
@@ -14,6 +15,7 @@ public class DetravLoader implements Runnable {
         new DetravMetaGeneratedItem01();
         new DetravMetaGeneratedTool01();
         new ProcessingDetravToolProPick();
+        new ProcessingDetravShaping();
         //new Detrav_MetaGenerated_Tool_01();
         //new ProcessingDetravToolProPick();
     }
diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index 648bb64293..a06dbe055d 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -17,7 +17,7 @@ import net.minecraft.init.Blocks;
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "0.5";
+    public static final String VERSION = "0.6";
 
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
 
diff --git a/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java
index a1c9ddf602..a64d9f0063 100644
--- a/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/tools/BehaviourDetravToolElectricProPick.java
@@ -17,10 +17,10 @@ import java.util.List;
 /**
  * Created by wital_000 on 19.03.2016.
  */
-public class BehaviourDetravToolElectricProPick extends Behaviour_None
+public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPick
 {
 
     public BehaviourDetravToolElectricProPick(int aCosts) {
-
+        super(aCosts);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java b/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java
index 8310ed9b95..7b27f83d80 100644
--- a/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java
+++ b/src/main/java/com/detrav/tools/DetravToolHVElectricProPick.java
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
  */
 public class DetravToolHVElectricProPick extends DetravToolMVElectricProPick {
     public int getBaseQuality() {
-        return 1;
+        return 2;
     }
 
     public float getMaxDurabilityMultiplier() {
diff --git a/src/main/java/com/detrav/tools/ProcessingDetravShaping.java b/src/main/java/com/detrav/tools/ProcessingDetravShaping.java
new file mode 100644
index 0000000000..b10c3c43ae
--- /dev/null
+++ b/src/main/java/com/detrav/tools/ProcessingDetravShaping.java
@@ -0,0 +1,38 @@
+package com.detrav.tools;
+
+import com.detrav.enums.DetravItemList;
+import com.detrav.enums.DetravSimpleItems;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.SubTag;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Created by wital_000 on 20.03.2016.
+ */
+public class ProcessingDetravShaping implements gregtech.api.interfaces.IOreRecipeRegistrator {
+
+    public ProcessingDetravShaping() {
+        OrePrefixes.ingot.add(this);
+    }
+
+    @Override
+    public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) {
+        if ((GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) && (!aMaterial.contains(SubTag.NO_SMELTING))) {
+            int tAmount = (int) (aPrefix.mMaterialAmount / 3628800L);
+            if ((tAmount > 0) && (tAmount <= 64) && (aPrefix.mMaterialAmount % 3628800L == 0L)) {
+                int tVoltageMultiplier = aMaterial.mBlastFurnaceTemp >= 2800 ? 64 : 16;
+
+                if (aMaterial.contains(SubTag.NO_SMASHING)) {
+                    tVoltageMultiplier /= 4;
+                } else if (aPrefix.name().startsWith(OrePrefixes.dust.name())) {
+                    return;
+                }
+                GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(2L, new Object[]{aStack}), DetravItemList.Shape_Extruder_ProPick.get(0L, new Object[0]), GT_OreDictUnificator.get(DetravSimpleItems.toolHeadProPick.get(aMaterial), tAmount), (int) Math.max(aMaterial.getMass() * 2L * tAmount, tAmount), 8 * tVoltageMultiplier);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java b/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
index 86895e00da..6037fa1f85 100644
--- a/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
+++ b/src/main/java/com/detrav/tools/ProcessingDetravToolProPick.java
@@ -1,6 +1,8 @@
 package com.detrav.tools;
 
+import com.detrav.enums.DetravItemList;
 import com.detrav.enums.DetravSimpleItems;
+import com.detrav.items.DetravMetaGeneratedItem01;
 import com.detrav.items.DetravMetaGeneratedTool01;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -33,5 +35,8 @@ public class ProcessingDetravToolProPick implements gregtech.api.interfaces.IOre
         GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, Materials.TungstenSteel, new long[]{1600000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_HV,Character.valueOf('E'), ItemList.Emitter_HV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel),  Character.valueOf('B'), ItemList.Battery_RE_HV_Lithium.get(1L, new Object[0])});
         GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, Materials.TungstenSteel, new long[]{1200000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_HV,Character.valueOf('E'), ItemList.Emitter_HV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel),  Character.valueOf('B'), ItemList.Battery_RE_HV_Cadmium.get(1L, new Object[0])});
         GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, Materials.TungstenSteel, new long[]{800000L, 512L, 3L, -1L}), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"EHR", "CSC", "PBP", Character.valueOf('S'), ItemList.Cover_Screen, Character.valueOf('R'), ItemList.Sensor_HV,Character.valueOf('E'), ItemList.Emitter_HV,Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('H'), DetravSimpleItems.toolHeadProPick.get(aMaterial), Character.valueOf('P'), OrePrefixes.plate.get(Materials.TungstenSteel), Character.valueOf('B'), ItemList.Battery_RE_HV_Sodium.get(1L, new Object[0])});
+
+        GT_ModHandler.addCraftingRecipe(DetravItemList.Shape_Extruder_ProPick.get(1L,new Object[0]),
+                new Object[]{"h","X","M", Character.valueOf('X'),DetravSimpleItems.toolHeadProPick.get(aMaterial),Character.valueOf('M'),ItemList.Shape_Empty});
     }
 }
\ No newline at end of file