robotex140 · shydow90 · Nov 17, 2023 · Nov 17, 2023
diff --git a/Contents/mods/Hydrocraft/media/lua/client/PlantsGrowing.lua b/Contents/mods/Hydrocraft/media/lua/client/PlantsGrowing.lua
@@ -89,6 +89,8 @@ function recipe_NDPlantsHarvest(items, result, player)
 		altSeedName = "Hydrocraft.HCTomatilloseeds";
 	elseif plantName == "Grape" then
 		altName = "Grapes";
+	elseif plantName == "Tea" then
+		altName = "Teafresh";
 	end
 
 	--Main product counts

diff --git a/Contents/mods/Hydrocraft/media/lua/server/FloraHCExtra.lua b/Contents/mods/Hydrocraft/media/lua/server/FloraHCExtra.lua
@@ -28,7 +28,7 @@ if (getGameTime():getMonth() + 1) > 10 or (getGameTime():getMonth() + 1) < 3 the
 
 else
 	-- no winter normal luck + all items
-	low = {'Hydrocraft.HCAcorn','Hydrocraft.HCFlax','Base.BerryGeneric1','"Base.BerryGeneric2','Base.BerryGeneric1','Base.BerryGeneric3','Base.BerryGeneric4','Hydrocraft.HCThistle','Base.Violets','Hydrocraft.HCClover','Hydrocraft.HCFern','Hydrocraft.HCFiddleheadfern','Hydrocraft.HCYewbough','Hydrocraft.HCSprucebough','Hydrocraft.HCElmbough','Hydrocraft.HCAlderbough','Hydrocraft.HCWillowbranch','Base.TreeBranch','Base.Twigs','Hydrocraft.HCFirbough','Hydrocraft.HCPinebough','Hydrocraft.HCMapleleaf','Hydrocraft.HCHickoryleaves','Hydrocraft.HCOakleaves','Hydrocraft.HCClover','Hydrocraft.HCWillowbark','Hydrocraft.HCBirchbark','Hydrocraft.HCBark','Hydrocraft.HCStraw','Hydrocraft.HCGrass','Hydrocraft.HCNettles'}
+	low = {'Hydrocraft.HCAcorn','Hydrocraft.HCFlax','Base.BerryGeneric1','Base.BerryGeneric2','Base.BerryGeneric3','Base.BerryGeneric4','Hydrocraft.HCThistle','Base.Violets','Hydrocraft.HCClover','Hydrocraft.HCFern','Hydrocraft.HCFiddleheadfern','Hydrocraft.HCYewbough','Hydrocraft.HCSprucebough','Hydrocraft.HCElmbough','Hydrocraft.HCAlderbough','Hydrocraft.HCWillowbranch','Base.TreeBranch','Base.Twigs','Hydrocraft.HCFirbough','Hydrocraft.HCPinebough','Hydrocraft.HCMapleleaf','Hydrocraft.HCHickoryleaves','Hydrocraft.HCOakleaves','Hydrocraft.HCClover','Hydrocraft.HCWillowbark','Hydrocraft.HCBirchbark','Hydrocraft.HCBark','Hydrocraft.HCStraw','Hydrocraft.HCGrass','Hydrocraft.HCNettles'}
 	medium = {'Hydrocraft.HCBleedingheart','Hydrocraft.HCCrabapple','Hydrocraft.HCSeaberry','Hydrocraft.HCBlackcurrant','Hydrocraft.HCRedcurrant','Hydrocraft.HCCrampbarkberry','Hydrocraft.HCGooseberry','Hydrocraft.HCHuckleberry','Hydrocraft.HCCranberry','Hydrocraft.HCArrowwoodberry','Hydrocraft.HCRaspberry','Hydrocraft.HCSumacberry','Hydrocraft.HCCrowberry','Hydrocraft.HCBlackthornberry','Hydrocraft.HCHawthornfruit','farming.Cabbage','farming.Potato','Base.Corn','Hydrocraft.HCTetterwort','Hydrocraft.HCMazus','Hydrocraft.HCCamellia','Hydrocraft.HCMorningglory','Hydrocraft.HCStrelitzia','Hydrocraft.HCColumbine','Hydrocraft.HCCinquefoils','Hydrocraft.HCChrysanthemum','Base.Log','Hydrocraft.HCSunflower','Hydrocraft.HCRhododendron','Hydrocraft.HCCalily','Hydrocraft.HCMagnolia','Hydrocraft.HCCarnation','Hydrocraft.HCBluedaisy','Hydrocraft.HCBlewitshroom','Hydrocraft.HCAnemome','Hydrocraft.HCDaffodil','Hydrocraft.HCTulip','Hydrocraft.HCPansy','Hydrocraft.HCDaisy','Hydrocraft.HCIris','Hydrocraft.HCWolfsbane','Hydrocraft.HCMandrake','Hydrocraft.HCBelladonna','Hydrocraft.HCLobstershroom','Hydrocraft.HCYellowmorelshroom','Hydrocraft.HCWitchshatshroom','Base.MushroomGeneric7','Base.MushroomGeneric6','Base.MushroomGeneric5','Base.MushroomGeneric4','Base.MushroomGeneric3','Base.MushroomGeneric2','Base.MushroomGeneric1','Base.Rosehips','Hydrocraft.HCValerian','Hydrocraft.HCCamomile','Hydrocraft.HCLavender','Hydrocraft.HCSpeedwell','Hydrocraft.HCDogwood','Hydrocraft.HCChantrelle','Hydrocraft.HCChicory','Hydrocraft.HCMulberry','Hydrocraft.HCMulberryleaf','Hydrocraft.HCKvann','Hydrocraft.HCHolly','Hydrocraft.HCJutestems','Hydrocraft.HCAcorn','Hydrocraft.HCThistle','Base.Violets','Hydrocraft.HCFlaxflower','Hydrocraft.HCFlax'}
 	good = {'Base.Lemon','Base.Apple','Hydrocraft.HCRaspberry','Hydrocraft.HCOakLog','Hydrocraft.HCCamellia','Hydrocraft.HCCandleberry','Hydrocraft.HCRosebud','Hydrocraft.HCLavender'}
 end

diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Barrels.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Barrels.txt
@@ -833,7 +833,7 @@ recipe Seal Biowaste
 
 recipe Fill Empty Metal Barrel With Gasoline
     {
-    	PetrolCan=20,
+    	[Recipe.GetItemTypes.Petrol]=20,
         HCBarrelmetalempty,
         keep HCFunnel/HCGlassfunnel,
         Result:HCBarrelmetalgasoline,
@@ -854,7 +854,7 @@ recipe Fill Empty Metal Barrel With Gasoline
 
 recipe Fill Empty Gasoline Barrel With Gasoline
     {
-    	PetrolCan=20,
+    	[Recipe.GetItemTypes.Petrol]=20,
         HCGasolinebarrelempty,
         keep HCFunnel/HCGlassfunnel,
         Result:HCGasolinebarrelfull,

diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Blueprints.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Blueprints.txt
@@ -956,7 +956,7 @@ recipe Research Blue Meth
     SkillRequired:Doctor=4,
 	Notebook,
 	Pencil/Pen,
-    keep HCLabbig,
+    keep HCLabbig2,
     keep HCBookchemistry,
 	keep HCBookpharmacology,
 	keep HCBookaluminumworking,

diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Boneworking.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Boneworking.txt
@@ -686,7 +686,7 @@ recipe Make Bone Powder
 recipe Make Bone Powder
     	{
     		keep HCMacerator,
-    		PetrolCan,
+    		[Recipe.GetItemTypes.Petrol],
     		HCBone/HCZombiebones,
     		CanBeDoneFromFloor:true,
     		Result:HCBonepowder=2,
@@ -710,7 +710,7 @@ recipe Make Shell Powder
 recipe Make Shell Powder
     	{
     		keep HCMacerator,
-    		PetrolCan,
+    		[Recipe.GetItemTypes.Petrol],
     		HCMusselshell,
     		CanBeDoneFromFloor:true,
     		Result:HCShellpowder=2,

diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Centifuge.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Centifuge.txt
@@ -81,7 +81,7 @@ recipe Use Centrifiuge
 recipe Use Electrolyzer
     {
     	keep HCElectrolyzer,
-    	PetrolCan,
+    	[Recipe.GetItemTypes.Petrol],
     	HCObsidianpowder=12,
     	NeedToBeLearn:true,
     	Result:HCIronpowder,

diff --git a/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Chemistry.txt b/Contents/mods/Hydrocraft/media/scripts/Hydrocraft/HC_Chemistry.txt
@@ -721,7 +721,7 @@ recipe Make Chalk Powder
 recipe Make Chalk Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCChalk/HCChalkrock,
         CanBeDoneFromFloor:true,
         Result:HCChalkpowder=2,
@@ -745,7 +745,7 @@ recipe Make Charcoal Powder
 recipe Make Charcoal Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         Charcoal,
         CanBeDoneFromFloor:true,
         Result:HCCharcoalpowder=2,
@@ -770,7 +770,7 @@ recipe Make Graphite Powder
 recipe Make Graphite Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCGraphite,
         CanBeDoneFromFloor:true,
         Result:HCGraphitepowder=2,
@@ -795,7 +795,7 @@ recipe Make Saltpeter Powder
 recipe Make Saltpeter Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCSaltpeter,
         CanBeDoneFromFloor:true,
         Result:HCSaltpeterpowder=2,
@@ -820,7 +820,7 @@ recipe Make Sulphur Powder
 recipe Make Sulphur Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCSulphur,
         CanBeDoneFromFloor:true,
         Result:HCSulphurpowder=2,
@@ -845,7 +845,7 @@ recipe Make Copper Powder
 recipe Make Copper Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCCopperore,
         CanBeDoneFromFloor:true,
         Result:HCCopperpowder=2,
@@ -870,7 +870,7 @@ recipe Make Tin Powder
 recipe Make Tin Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCTinore,
         CanBeDoneFromFloor:true,
         Result:HCTinpowder=2,
@@ -895,7 +895,7 @@ recipe Make Lead Powder
 recipe Make Lead Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCLeadore,
         CanBeDoneFromFloor:true,
         Result:HCLeadpowder=2,
@@ -920,7 +920,7 @@ recipe Make Iron Powder
 recipe Make Iron Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCIronore,
         CanBeDoneFromFloor:true,
         Result:HCIronpowder=2,
@@ -945,7 +945,7 @@ recipe Make Magnetite Powder
 recipe Make Magnetite Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCMagnetite,
         CanBeDoneFromFloor:true,
         Result:HCMagnetitepowder=2,
@@ -970,7 +970,7 @@ recipe Make Meteorite Powder
 recipe Make Meteorite Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCMeteorite,
         CanBeDoneFromFloor:true,
         Result:HCMeteoritepowder=2,
@@ -995,7 +995,7 @@ recipe Make Silver Powder
 recipe Make Silver Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCSilverore,
         CanBeDoneFromFloor:true,
         Result:HCSilverpowder=2,
@@ -1020,7 +1020,7 @@ recipe Make Gold Powder
 recipe Make Gold Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCGoldore,
         CanBeDoneFromFloor:true,
         Result:HCGoldpowder=2,
@@ -1045,7 +1045,7 @@ recipe Make Aluminum Powder
 recipe Make Aluminum Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCBauxiteore,
         CanBeDoneFromFloor:true,
         Result:HCAluminumpowder=2,
@@ -1070,7 +1070,7 @@ recipe Make Zinc Powder
 recipe Make Zinc Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCZincore,
         CanBeDoneFromFloor:true,
         Result:HCZincpowder=2,
@@ -1095,7 +1095,7 @@ recipe Make Nickel Powder
 recipe Make Nickel Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCNickelore,
         CanBeDoneFromFloor:true,
         Result:HCNickelpowder=2,
@@ -1120,7 +1120,7 @@ recipe Make Cobalt Powder
 recipe Make Cobalt Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCCobaltore,
         CanBeDoneFromFloor:true,
         Result:HCCobaltpowder=2,
@@ -1145,7 +1145,7 @@ recipe Make Chrome Powder
 recipe Make Chrome Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCChromeore,
         CanBeDoneFromFloor:true,
         Result:HCChromepowder=2,
@@ -1170,7 +1170,7 @@ recipe Make Tungsten Powder
 recipe Make Tungsten Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCTungstenore,
         CanBeDoneFromFloor:true,
         Result:HCTungstenpowder=2,
@@ -1184,7 +1184,7 @@ recipe Make Tungsten Powder
 recipe Make Titanium Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCTitaniumore,
         CanBeDoneFromFloor:true,
         Result:HCTitaniumpowder=2,
@@ -1222,7 +1222,7 @@ recipe Make Phosphorus Powder
 recipe Make Phosphorus Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCBerlinite/HCLapislazuli,
         CanBeDoneFromFloor:true,
         Result:HCPhosphoruspowder=2,
@@ -1247,7 +1247,7 @@ recipe Make Lithium Powder
 recipe Make Lithium Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCLithiumore,
         CanBeDoneFromFloor:true,
         Result:HCLithiumpowder=2,
@@ -1272,7 +1272,7 @@ recipe Make Lapis Lazuli Powder
 recipe Make Lapis Lazuli Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCLapislazuli,
         CanBeDoneFromFloor:true,
         Result:HCLapislazulipowder=2,
@@ -1297,7 +1297,7 @@ recipe Make Azurite Powder
 recipe Make Azurite Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCAzurite,
         CanBeDoneFromFloor:true,
         Result:HCAzuritepowder=2,
@@ -1322,7 +1322,7 @@ recipe Make Jade Powder
 recipe Make Jade Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCJade,
         CanBeDoneFromFloor:true,
         Result:HCJadepowder=2,
@@ -1347,7 +1347,7 @@ recipe Make Malachite Powder
 recipe Make Malachite Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCMalachite,
         CanBeDoneFromFloor:true,
         Result:HCMalachitepowder=2,
@@ -1372,7 +1372,7 @@ recipe Make Marble Powder
 recipe Make Marble Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCMarble,
         CanBeDoneFromFloor:true,
         Result:HCMarblepowder=2,
@@ -1397,7 +1397,7 @@ recipe Make Albite Powder
 recipe Make Albite Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCAlbite,
         CanBeDoneFromFloor:true,
         Result:HCAlbitepowder=2,
@@ -1422,7 +1422,7 @@ recipe Make Feldspar Powder
 recipe Make Feldspar Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCFeldspar,
         CanBeDoneFromFloor:true,
         Result:HCFeldsparpowder=2,
@@ -1447,7 +1447,7 @@ recipe Make Gypsum Powder
 recipe Make Gypsum Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCGypsum,
         CanBeDoneFromFloor:true,
         Result:HCGypsumpowder=2,
@@ -1472,7 +1472,7 @@ recipe Make Diatomite Powder
 recipe Make Diatomite Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCDiatomite,
         CanBeDoneFromFloor:true,
         Result:HCDiatomitepowder=2,
@@ -1496,7 +1496,7 @@ recipe Make Trona Powder
 recipe Make Trona Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCTrona,
         CanBeDoneFromFloor:true,
         Result:HCTronapowder=2,
@@ -1533,7 +1533,7 @@ recipe Make Thermite
     {
         Sparklers=10,
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         CanBeDoneFromFloor:true,
         Result:HCThermite=2,
         NeedToBeLearn:true,
@@ -1598,7 +1598,7 @@ recipe Fill Ammonal in Bag
 
 recipe Make Ephedrin Powder
     {
-        keep HCLab/HCMedicallab,
+        keep HCLab2/HCMedicallab2,
         HCEphedrine=15,
         Result:HCEphedrinepowder,
         CanBeDoneFromFloor:true,
@@ -1611,7 +1611,7 @@ recipe Make Ephedrin Powder
 recipe Make Ephedrin Powder
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCEphedrine=15,
         CanBeDoneFromFloor:true,
         Result:HCEphedrinepowder=2,
@@ -2052,7 +2052,7 @@ recipe Grind Solid Fuel Cube
 recipe Grind Solid Fuel Cube
     {
         keep HCMacerator,
-        PetrolCan,
+        [Recipe.GetItemTypes.Petrol],
         HCSolidfuelcube,
         CanBeDoneFromFloor:true,
         Result:HCHexapowder=2,