+ Added more smart plunger

Detrav · Jan 6, 2018 · 6b260a7 · 6b260a7
1 parent 7860708
commit 6b260a7
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 41 deletions.
diff --git a/build.properties b/build.properties
@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1566-1.7.10
 
-detravscanner.version=gt.9.32-0.48.0
+detravscanner.version=gt.9.32-0.49.0
 
 ae2.version=rv2-beta-33
 applecore.version=1.7.10-1.2.1+107.59407

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
@@ -25,7 +25,7 @@
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "0.48";
+    public static final String VERSION = "0.49";
 
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
 

diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java
@@ -35,9 +35,16 @@ public DetravMetaGeneratedTool01() {
         if (DetravConfig.REPAIR_TOOL_ENABLE)
             addTool(2, "Portable Anvil", "", new DetravToolPortableAnvil(), new Object[]{DetravToolDictNames.craftingToolPortableAnvil}, new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 10));
         if(DetravConfig.SMART_PLUNGER_ENABLE) {
-            addTool(4, "Smart plunger 1 bucket", "", new DetravToolSmartPlunger(), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
-            addTool(6, "Smart plunger 16 buckets", "", new DetravToolSmartPlunger16(), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
-            addTool(8, "Smart plunger 64 buckets", "", new DetravToolSmartPlunger64(), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(4, "Smart plunger 1 bucket", "", new DetravToolSmartPlunger(1,0.5f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(6, "Smart plunger 8 buckets", "", new DetravToolSmartPlunger(8,0.75f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(8, "Smart plunger 32 buckets", "", new DetravToolSmartPlunger(32,1f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(12, "Smart plunger 64 buckets", "", new DetravToolSmartPlunger(64,1.25f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(14, "Smart plunger 128 buckets", "", new DetravToolSmartPlunger(128,1.5f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(16, "Smart plunger 512 buckets", "", new DetravToolSmartPlunger(512,1.75f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(18, "Smart plunger 2K buckets", "", new DetravToolSmartPlunger(2*1024,2f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(20, "Smart plunger 8K buckets", "", new DetravToolSmartPlunger(8*1024,2.25f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(22, "Smart plunger 32K buckets", "", new DetravToolSmartPlunger(32*1024,2.5f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
+            addTool(24, "Smart plunger 128K buckets", "", new DetravToolSmartPlunger(128*1024,3f), new Object[]{DetravToolDictNames.craftingToolSmartPlunger}, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 8L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 5L));
         }
         if(DetravConfig.TREE_TAP_ENABLE)
             addTool(10, "Smart Tree Tap", "Changes resin tap", new DetravToolSmartTreeTap(), new Object[]{DetravToolDictNames.craftingToolSmartTreeTap}, new TC_Aspects.TC_AspectStack(TC_Aspects.ARBOR, 5L));

diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java b/src/main/java/com/detrav/items/processing/ProcessingDetravSmartPlunger.java
@@ -38,10 +38,60 @@ public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDic
                 GT_ModHandler.addCraftingRecipe(
                         DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, aMaterial, aMaterial, null),
                         GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Aluminium.get(1)});
+                //gtnewhorizons
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(12, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_StainlessSteel.get(1)});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(14, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Titanium.get(1)});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(16, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
                         new Object[]{"xRR", " CR", "S f",
                                 Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
                                 Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
                                 Character.valueOf('C'), ItemList.Large_Fluid_Cell_TungstenSteel.get(1)});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(18, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Chrome.get(1)});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(20, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Iridium.get(1)});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(22, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Osmium.get(1)});
+                GT_ModHandler.addCraftingRecipe(
+                        DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(24, 1, aMaterial, aMaterial, null),
+                        GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED,
+                        new Object[]{"xRR", " CR", "S f",
+                                Character.valueOf('S'), OrePrefixes.stick.get(aMaterial),
+                                Character.valueOf('R'), OrePrefixes.plate.get(Materials.Rubber),
+                                Character.valueOf('C'), ItemList.Large_Fluid_Cell_Neutronium.get(1)});
             }
         }
     }

diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger.java
@@ -22,12 +22,21 @@
  */
 public class DetravToolSmartPlunger
         extends GT_Tool {
+
+    protected final int mBuckets;
+    protected final float mDurabilityMultiplier;
+
+    public DetravToolSmartPlunger(int aBuckets, float aDurabilityMultiplier) {
+        mBuckets = aBuckets;
+        mDurabilityMultiplier = aDurabilityMultiplier;
+    }
+
     public float getBaseDamage() {
         return 1.25F;
     }
 
     public float getMaxDurabilityMultiplier() {
-        return 0.50F;
+        return mDurabilityMultiplier;
     }
 
     public String getCraftingSound() {
@@ -60,7 +69,7 @@ public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {
     }
 
     public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {
-        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(),1000));
+        aItem.addItemBehavior(aID, new BehaviourDetravToolSmartPlunger(getToolDamagePerDropConversion(), mBuckets * 1000));
     }
 
     public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) {

diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger16.java
diff --git a/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java b/src/main/java/com/detrav/items/tools/DetravToolSmartPlunger64.java